diff --git a/helpers/DATA/debian-installer/chmod_755_ld-linux.patch b/helpers/DATA/debian-installer/chmod_755_ld-linux2.patch similarity index 50% rename from helpers/DATA/debian-installer/chmod_755_ld-linux.patch rename to helpers/DATA/debian-installer/chmod_755_ld-linux2.patch index 61bba962fba3d07aeca670f3b45d83fb8b72e66d..7d226adbcc94829ef8fc3166ea21e06e9d2a35ff 100644 --- a/helpers/DATA/debian-installer/chmod_755_ld-linux.patch +++ b/helpers/DATA/debian-installer/chmod_755_ld-linux2.patch @@ -1,11 +1,16 @@ ---- a/build/Makefile 2023-05-17 02:42:44.707584584 -0600 -+++ b/build/Makefile 2023-05-17 02:44:14.563930750 -0600 -@@ -440,6 +440,9 @@ +diff --git a/build/Makefile b/build/Makefile +index c073a32..cace03d 100644 +--- a/build/Makefile ++++ b/build/Makefile +@@ -431,6 +431,12 @@ endif ifeq ($(DEB_HOST_ARCH_OS),linux) ifdef KERNELVERSION -+ifeq ($(DEB_HOST_ARCH),amd64) ++ifneq ($(DEB_HOST_ARCH),ppc64el) + chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld-linux* ++endif ++ifeq ($(DEB_HOST_ARCH),ppc64el) ++ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld*.so* +endif # Set up modules.dep, ensure there is at least one standard dir (kernel # in this case), so depmod will use its prune list for archs with no diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer index a9d66e289be2da192afe3eb6427cd45add335835..7104c2b0166107c42d9a3d3cd8a79fbef0ef082f 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=13 +VERSION=14 EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' REPOKEY=0E98404D386FA1D9 NETINST=true @@ -139,7 +139,7 @@ grep -rl cdrom-core-modules- build/pkg-lists/ |xargs sed -i '/cdrom-core-modules grep -rl cdebconf-gtk-entropy build/config/ | xargs sed -i 's/cdebconf-gtk-entropy//' # Ensure that ld-linux is executable -patch --no-backup-if-mismatch -p1 < $DATA/chmod_755_ld-linux.patch +patch --no-backup-if-mismatch -p1 < $DATA/chmod_755_ld-linux2.patch # HACK: include liblzma.so and liblz4.so from host into iso image, as runtime dependencies of zstd sed '/not packaged as a udeb/a\\tcp /lib/$(DEB_HOST_MULTIARCH)/liblzma.so.5* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile