nchevsky/systemrescue-zfs
1
0
Fork 0
mirror of https://github.com/nchevsky/systemrescue-zfs.git synced 2026-01-05 16:20:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build with newer glibc due to libnss symlinks

Browse source 
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
This commit is contained in:
Gerd v. Egidy 2022-12-15 23:01:02 +01:00
parent c466c954c0
commit 253e1fed4f
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
patches/archiso-v43-08-glibc-fix-dns.patch
View file

@ -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