summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2018-09-27 06:54:55 (GMT)
committerAlexey Neyman <stilor@att.net>2018-09-27 06:54:55 (GMT)
commitd573c1575825de8c47aaeca89db54226ff702924 (patch)
tree9be873831226a624216b0110f945d700b33771c9
parent29f0662c188e7126871fa84f6e6f854cda279c89 (diff)
Use 'chmod a-x' instead of 'chmod -x'
There is a subtle difference when executable bit is a part of the umask. And at least some versions (Debian/stretch) fail if the resulting mode would've been different if not for the umask setting. Fixes #998. Although, with such chmods/umasks it is likely that some package installation will break anyway. But I'll leave it until somebody complains. Signed-off-by: Alexey Neyman <stilor@att.net>
-rw-r--r--Makefile.am6
-rw-r--r--scripts/build/binutils/binutils.sh2
-rw-r--r--scripts/build/debug/300-gdb.sh2
-rw-r--r--testing/docker/archlinux/Dockerfile2
-rwxr-xr-xtesting/docker/dmgr.sh2
-rw-r--r--testing/docker/gentoo-amd64/Dockerfile2
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 84bbe43..5fdee30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,10 +65,10 @@ bash-completion/ct-ng: bash-completion/ct-ng.in Makefile
install-data-hook:
rm -f $(DESTDIR)$(man1dir)/$(ctng_progname).1.gz
gzip -9 $(DESTDIR)$(man1dir)/$(ctng_progname).1
- chmod +x $(DESTDIR)$(pkgdatadir)/scripts/config.guess
- chmod +x $(DESTDIR)$(pkgdatadir)/scripts/config.sub
+ chmod a+x $(DESTDIR)$(pkgdatadir)/scripts/config.guess
+ chmod a+x $(DESTDIR)$(pkgdatadir)/scripts/config.sub
if INSTALL_BASH_COMPLETION
- chmod -x $(DESTDIR)$(compdir)/$(ctng_progname)
+ chmod a-x $(DESTDIR)$(compdir)/$(ctng_progname)
endif
uninstall-hook:
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index 703a6fa..e8060ec 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -223,7 +223,7 @@ do_binutils_backend() {
sed -r -e "s/@@DEFAULT_LD@@/${CT_BINUTILS_LINKER_DEFAULT}/" \
"${CT_LIB_DIR}/scripts/build/binutils/binutils-ld.in" \
>"${prefix}/bin/${CT_TARGET}-ld"
- chmod +x "${prefix}/bin/${CT_TARGET}-ld"
+ chmod a+x "${prefix}/bin/${CT_TARGET}-ld"
cp -a "${prefix}/bin/${CT_TARGET}-ld" \
"${prefix}/${CT_TARGET}/bin/ld"
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index fe6ce79..c73e430 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -315,7 +315,7 @@ do_debug_gdb_build() {
# Workaround for bad versions, where the configure
# script for gdbserver is not executable...
# Bah, GNU folks strike again... :-(
- chmod +x "${gdb_src_dir}/gdb/gdbserver/configure"
+ chmod a+x "${gdb_src_dir}/gdb/gdbserver/configure"
gdbserver_extra_config=("${extra_config[@]}")
diff --git a/testing/docker/archlinux/Dockerfile b/testing/docker/archlinux/Dockerfile
index 4c90925..2ad9d64 100644
--- a/testing/docker/archlinux/Dockerfile
+++ b/testing/docker/archlinux/Dockerfile
@@ -1,3 +1,3 @@
-FROM hoverbear/archlinux
+FROM base/archlinux:latest
RUN pacman -Syu --noconfirm
RUN pacman -S --noconfirm base-devel git help2man python unzip
diff --git a/testing/docker/dmgr.sh b/testing/docker/dmgr.sh
index 0824784..b6a4294 100755
--- a/testing/docker/dmgr.sh
+++ b/testing/docker/dmgr.sh
@@ -109,7 +109,7 @@ action_clean()
msg "Cleaning up after ${cntr}"
if [ -d build-${cntr} ]; then
- chmod -R +w build-${cntr}
+ chmod -R a+w build-${cntr}
rm -rf build-${cntr}
fi
}
diff --git a/testing/docker/gentoo-amd64/Dockerfile b/testing/docker/gentoo-amd64/Dockerfile
index 6500564..455e315 100644
--- a/testing/docker/gentoo-amd64/Dockerfile
+++ b/testing/docker/gentoo-amd64/Dockerfile
@@ -1,4 +1,4 @@
FROM gentoo/stage3-amd64-hardened
RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
-RUN chmod +x /sbin/dumb-init
+RUN chmod a+x /sbin/dumb-init
ENTRYPOINT [ "/sbin/dumb-init", "--" ]