diff --git a/helpers/DATA/debian-installer/chmod_755_ld-linux.patch b/helpers/DATA/debian-installer/chmod_755_ld.patch similarity index 78% rename from helpers/DATA/debian-installer/chmod_755_ld-linux.patch rename to helpers/DATA/debian-installer/chmod_755_ld.patch index 61bba962fba3d07aeca670f3b45d83fb8b72e66d..d5ff896d10c2b828be5cdbd7a6a2cb0f3d57618d 100644 --- a/helpers/DATA/debian-installer/chmod_755_ld-linux.patch +++ b/helpers/DATA/debian-installer/chmod_755_ld.patch @@ -1,11 +1,14 @@ --- 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 @@ +@@ -440,6 +440,12 @@ ifeq ($(DEB_HOST_ARCH_OS),linux) ifdef KERNELVERSION +ifeq ($(DEB_HOST_ARCH),amd64) + chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld-linux* ++endif ++ifeq ($(DEB_HOST_ARCH),ppc64el) ++ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld64.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..2b777a8eed6abbeb453d1c2871b6fc6a5176589f 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -138,8 +138,8 @@ grep -rl acpi-modules- build/pkg-lists/ |xargs sed -i '/acpi-modules-/d' grep -rl cdrom-core-modules- build/pkg-lists/ |xargs sed -i '/cdrom-core-modules-/d' 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 +# Ensure that ld-linux (amd64) and ld64 (ppc64el) is executable +patch --no-backup-if-mismatch -p1 < $DATA/chmod_755_ld.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