Sat Aug 4 07:38:34 UTC 201820180804073834

a/dbus-1.12.10-x86_64-1.txz:  Upgraded.
a/kernel-generic-4.14.60-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.60-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.60-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.60-x86-1.txz:  Upgraded.
d/mercurial-4.7-x86_64-1.txz:  Upgraded.
d/rust-1.28.0-x86_64-1.txz:  Upgraded.
k/kernel-source-4.14.60-noarch-1.txz:  Upgraded.
xap/blueman-2.0.6-x86_64-2.txz:  Rebuilt.
  Allow users in the netdev group to make changes.
  Thanks to voleg, kgha, and zakame.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
testing/packages/glibc-2.28-x86_64-2.txz:  Rebuilt.
  Fixed compile issues when linking with libpthread.
testing/packages/glibc-i18n-2.28-x86_64-2.txz:  Rebuilt.
testing/packages/glibc-profile-2.28-x86_64-2.txz:  Rebuilt.
testing/packages/glibc-solibs-2.28-x86_64-2.txz:  Rebuilt.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

1 files changed, 6 insertions, 41 deletions

diff --git a/testing/source/glibc/doinst.sh-glibc b/testing/source/glibc/doinst.sh-glibc
index 4ce7c1a08..e2c7d3ef1 100644
--- a/testing/source/glibc/doinst.sh-glibc
+++ b/testing/source/glibc/doinst.sh-glibc
@@ -84,7 +84,7 @@ if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly
       done
     )
   ) 9> run/lock/pkgtools/ldconfig.lock
-else # no ldconfig?  Good, it's safe to just jam it on home (and make links below):
+else # no ldconfig? This is a broken situation, but we will do what we can:
   ( cd lib/incoming
     for file in * ; do
       cp -a $file ..
@@ -114,6 +114,11 @@ config etc/profile.d/glibc.sh.new
 rm -f etc/profile.d/glibc.csh.new
 rm -f etc/profile.d/glibc.sh.new
 
+# This block below *should* be dead code, but it's probably safer to leave it
+# here as a fallback. It no longer has complete coverage of all the links
+# that would be needed in /lib${LIBDIRSUFFIX}, but it covers enough that if
+# we did fall back on this the machine would boot until it reached the boot
+# time call to ldconfig, which would then take care of any missing links.
 # In case there's no ldconfig, make the links manually:
 if [ ! -x /sbin/ldconfig ]; then
 ( cd lib ; rm -rf libnss_nis.so.2 )
@@ -157,43 +162,3 @@ if [ ! -x /sbin/ldconfig ]; then
 fi
 
 # More links:
-( cd usr/lib ; rm -rf libnss_nisplus.so )
-( cd usr/lib ; ln -sf ../../lib/libnss_nisplus.so.2 libnss_nisplus.so )
-# This is now a linker script:
-#( cd usr/lib ; rm -rf libpthread.so )
-#( cd usr/lib ; ln -sf ../../lib/libpthread.so.0 libpthread.so )
-( cd usr/lib ; rm -rf libresolv.so )
-( cd usr/lib ; ln -sf ../../lib/libresolv.so.2 libresolv.so )
-( cd usr/lib ; rm -rf libnsl.so )
-( cd usr/lib ; ln -sf ../../lib/libnsl.so.1 libnsl.so )
-( cd usr/lib ; rm -rf libnss_hesiod.so )
-( cd usr/lib ; ln -sf ../../lib/libnss_hesiod.so.2 libnss_hesiod.so )
-( cd usr/lib ; rm -rf libnss_files.so )
-( cd usr/lib ; ln -sf ../../lib/libnss_files.so.2 libnss_files.so )
-# This is now a linker script:
-#( cd usr/lib ; rm -rf libm.so )
-#( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so )
-( cd usr/lib ; rm -rf libutil.so )
-( cd usr/lib ; ln -sf ../../lib/libutil.so.1 libutil.so )
-( cd usr/lib ; rm -rf libnss_compat.so )
-( cd usr/lib ; ln -sf ../../lib/libnss_compat.so.2 libnss_compat.so )
-( cd usr/lib ; rm -rf libthread_db.so )
-( cd usr/lib ; ln -sf ../../lib/libthread_db.so.1 libthread_db.so )
-( cd usr/lib ; rm -rf libcrypt.so )
-( cd usr/lib ; ln -sf ../../lib/libcrypt.so.1 libcrypt.so )
-( cd usr/lib ; rm -rf libBrokenLocale.so )
-( cd usr/lib ; ln -sf ../../lib/libBrokenLocale.so.1 libBrokenLocale.so )
-( cd usr/lib ; rm -rf libdl.so )
-( cd usr/lib ; ln -sf ../../lib/libdl.so.2 libdl.so )
-( cd usr/lib ; rm -rf libnss_dns.so )
-( cd usr/lib ; ln -sf ../../lib/libnss_dns.so.2 libnss_dns.so )
-( cd usr/lib ; rm -rf librt.so )
-( cd usr/lib ; ln -sf ../../lib/librt.so.1 librt.so )
-( cd usr/lib ; rm -rf libanl.so )
-( cd usr/lib ; ln -sf ../../lib/libanl.so.1 libanl.so )
-( cd usr/lib ; rm -rf libnss_nis.so )
-( cd usr/lib ; ln -sf ../../lib/libnss_nis.so.2 libnss_nis.so )
-( cd usr/share/zoneinfo ; rm -rf localtime )
-( cd usr/share/zoneinfo ; ln -sf /etc/localtime localtime )
-( cd bin ; rm -rf sln )
-( cd bin ; ln -sf /sbin/sln sln )