diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | support/scripts/check-host-rpath | 8 |
2 files changed, 12 insertions, 6 deletions
@@ -237,7 +237,7 @@ LEGAL_REPORT = $(LEGAL_INFO_DIR)/README # dependencies anywhere else # ################################################################################ -$(BUILD_DIR) $(TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): +$(BUILD_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): @mkdir -p $@ BR2_CONFIG = $(CONFIG_DIR)/.config @@ -552,11 +552,15 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf .PHONY: world world: target-post-image +# When creating HOST_DIR, also symlink usr/lib -> ../lib +$(HOST_DIR): + @mkdir -p $@/usr $@/lib + @ln -snf ../lib $@/usr/lib + # Populating the staging with the base directories is handled by the skeleton package -$(STAGING_DIR): +$(STAGING_DIR): | $(HOST_DIR) @mkdir -p $(STAGING_DIR) @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging - @mkdir -p $(HOST_DIR)/usr @ln -snf ../$(GNU_TARGET_NAME) $(HOST_DIR)/usr/$(GNU_TARGET_NAME) RSYNC_VCS_EXCLUSIONS = \ diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath index 020c12379f..adabfdf53f 100755 --- a/support/scripts/check-host-rpath +++ b/support/scripts/check-host-rpath @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# This script scans $(HOST_DIR)/{bin,sbin} for all ELF files, and checks -# they have an RPATH to $(HOST_DIR)/usr/lib if they need libraries from +# This script scans $(HOST_DIR)/{,usr/}{bin,sbin} for all ELF files, and checks +# they have an RPATH to $(HOST_DIR)/{,usr/}lib if they need libraries from # there. # Override the user's locale so we are sure we can parse the output of @@ -40,7 +40,7 @@ elf_needs_rpath() { local lib while read lib; do - [ -e "${hostdir}/usr/lib/${lib}" ] && return 0 + [ -e "${hostdir}/lib/${lib}" ] && return 0 done < <( readelf -d "${file}" \ |sed -r -e '/^.* \(NEEDED\) .*Shared library: \[(.+)\]$/!d;' \ -e 's//\1/;' \ @@ -58,6 +58,8 @@ check_elf_has_rpath() { for dir in ${rpath//:/ }; do # Remove duplicate and trailing '/' for proper match dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )" + [ "${dir}" = "${hostdir}/lib" -o "${dir}" = "\$ORIGIN/../lib" ] && return 0 + # For the time being, the rpath is allowed with both usr/lib and lib [ "${dir}" = "${hostdir}/usr/lib" -o "${dir}" = "\$ORIGIN/../../usr/lib" ] && return 0 done done < <( readelf -d "${file}" \ |
