From 253e1fed4f9ac312051dc2c97bcde417058c302c Mon Sep 17 00:00:00 2001 From: "Gerd v. Egidy" Date: Thu, 15 Dec 2022 23:01:02 +0100 Subject: [PATCH] fix build with newer glibc due to libnss symlinks Newer glibc versions do not provide nss libraries like libnss_files as fully versioned files and symlinks anymore, but just have libnss_files.so.2. archiso expected symlinks and this leads to build failures. Adapt the archiso patch to the new file scheme. Fixes #314 --- patches/archiso-v43-08-glibc-fix-dns.patch | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/patches/archiso-v43-08-glibc-fix-dns.patch b/patches/archiso-v43-08-glibc-fix-dns.patch index 9c36768..0d64439 100644 --- a/patches/archiso-v43-08-glibc-fix-dns.patch +++ b/patches/archiso-v43-08-glibc-fix-dns.patch @@ -1,14 +1,18 @@ diff -u -r archiso-43.orig/archiso/initcpio/install/archiso_pxe_common archiso-43/archiso/initcpio/install/archiso_pxe_common ---- archiso-43.orig/archiso/initcpio/install/archiso_pxe_common 2019-10-16 11:10:09.000000000 +0000 -+++ archiso-43/archiso/initcpio/install/archiso_pxe_common 2022-07-04 21:27:54.206666328 +0000 -@@ -12,9 +12,16 @@ - add_binary $(readlink -f /usr/lib/libnss_files.so.2) - add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2) - add_binary $(readlink -f /usr/lib/libnss_dns.so.2) -+ add_symlink /usr/lib/libnss_mymachines.so.2 $(readlink /usr/lib/libnss_mymachines.so.2) -+ add_binary $(readlink -f /usr/lib/libnss_mymachines.so.2) -+ add_symlink /usr/lib/libnss_resolve.so.2 $(readlink /usr/lib/libnss_resolve.so.2) -+ add_binary $(readlink -f /usr/lib/libnss_resolve.so.2) +--- archiso-43.orig/archiso/initcpio/install/archiso_pxe_common 2022-12-15 21:48:53.560000001 +0000 ++++ archiso-43/archiso/initcpio/install/archiso_pxe_common 2022-12-15 21:51:30.649999999 +0000 +@@ -8,13 +8,16 @@ + add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig + + # Add hosts support files+dns +- add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2) +- add_binary $(readlink -f /usr/lib/libnss_files.so.2) +- add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2) +- add_binary $(readlink -f /usr/lib/libnss_dns.so.2) ++ add_binary /usr/lib/libnss_files.so.2 ++ add_binary /usr/lib/libnss_dns.so.2 ++ add_binary /usr/lib/libnss_mymachines.so.2 ++ add_binary /usr/lib/libnss_resolve.so.2 add_dir /etc echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf