Browse Source

Merge pull request #1036 from stilor/small-fixes

Small fixes
dev-linux
Alexey Neyman 4 years ago committed by GitHub
parent
commit
5f18c3ed4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      Makefile.am
  2. 2
      config/global/paths.in
  3. 2
      scripts/build/binutils/binutils.sh
  4. 2
      scripts/build/debug/300-gdb.sh
  5. 23
      scripts/crosstool-NG.sh
  6. 2
      testing/docker/archlinux/Dockerfile
  7. 2
      testing/docker/dmgr.sh
  8. 2
      testing/docker/gentoo-amd64/Dockerfile

6
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:

2
config/global/paths.in

@ -42,7 +42,7 @@ config WORK_DIR
config BUILD_TOP_DIR
string
default "${CT_WORK_DIR}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
default "${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
config PREFIX_DIR
string

2
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"

2
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[@]}")

23
scripts/crosstool-NG.sh

@ -74,6 +74,7 @@ for d in \
LOCAL_TARBALLS \
WORK \
PREFIX \
BUILD_TOP \
INSTALL \
; do
eval dir="\${CT_${d}_DIR}"
@ -88,6 +89,17 @@ for d in \
CT_Abort "'CT_${d}_DIR'='${dir}' contains a comma in it.\nDon't use commas in paths, it breaks things."
;;
esac
case "${dir}" in
/*)
# Absolute path, okay
;;
*)
# Relative path from CT_TOP_DIR, make absolute
eval CT_${d}_DIR="${CT_TOP_DIR}/${dir}"
# Having .. inside CT_PREFIX breaks relocatability.
CT_SanitizeVarDir CT_${d}_DIR
;;
esac
done
# Where will we work?
@ -304,20 +316,17 @@ CT_DoExecLog ALL mkdir -p "${CT_HOST_COMPLIBS_DIR}"
# Only create the state dir if asked for a restartable build
[ -n "${CT_DEBUG_CT_SAVE_STEPS}" ] && CT_DoExecLog ALL mkdir -p "${CT_STATE_DIR}"
# Kludge: CT_PREFIX_DIR might have grown read-only if
# the previous build was successful.
CT_DoExecLog ALL chmod -R u+w "${CT_PREFIX_DIR}"
# Check install file system case-sensitiveness
CT_DoExecLog DEBUG touch "${CT_PREFIX_DIR}/foo"
CT_TestAndAbort "Your file system in '${CT_PREFIX_DIR}' is *not* case-sensitive!" -f "${CT_PREFIX_DIR}/FOO"
CT_DoExecLog DEBUG rm -f "${CT_PREFIX_DIR}/foo"
# Kludge: CT_PREFIX_DIR might have grown read-only if
# the previous build was successful.
CT_DoExecLog ALL chmod -R u+w "${CT_PREFIX_DIR}"
# Setting up the rest of the environment only if not restarting
if [ -z "${CT_RESTART}" ]; then
# Having .. inside CT_PREFIX breaks relocatability.
CT_SanitizeVarDir CT_PREFIX_DIR
case "${CT_SYSROOT_NAME}" in
"") CT_SYSROOT_NAME="sysroot";;
.) CT_Abort "Sysroot name is set to '.' which is forbidden";;

2
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

2
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
}

2
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", "--" ]

Loading…
Cancel
Save