CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debian-installer: update ld permissions patch.

Browse source
This commit is contained in:
Luis Guzmán 2023-07-06 20:02:37 +00:00
parent 742eb1c3ae
commit 747d5db6a2
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
helpers/DATA/debian-installer/chmod_755_ld-linux.patch → helpers/DATA/debian-installer/chmod_755_ld-linux2.patch
View file

@ -1,11 +1,16 @@
--- a/build/Makefile 2023-05-17 02:42:44.707584584 -0600 diff --git a/build/Makefile b/build/Makefile
+++ b/build/Makefile 2023-05-17 02:44:14.563930750 -0600 index c073a32..cace03d 100644
@@ -440,6 +440,9 @@ --- a/build/Makefile
+++ b/build/Makefile
@@ -431,6 +431,12 @@ endif
ifeq ($(DEB_HOST_ARCH_OS),linux) ifeq ($(DEB_HOST_ARCH_OS),linux)
ifdef KERNELVERSION ifdef KERNELVERSION
+ifeq ($(DEB_HOST_ARCH),amd64) +ifneq ($(DEB_HOST_ARCH),ppc64el)
+ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld-linux* + 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 +endif
# Set up modules.dep, ensure there is at least one standard dir (kernel # 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 # in this case), so depmod will use its prune list for archs with no

4
helpers/make-debian-installer
View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # 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' EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
REPOKEY=0E98404D386FA1D9 REPOKEY=0E98404D386FA1D9
NETINST=true 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//' grep -rl cdebconf-gtk-entropy build/config/ | xargs sed -i 's/cdebconf-gtk-entropy//'
# Ensure that ld-linux is executable # 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 # 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 sed '/not packaged as a udeb/a\\tcp /lib/$(DEB_HOST_MULTIARCH)/liblzma.so.5* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile