r6167 - in glibc-package/trunk/debian: . debhelper.in local/etc
Author: aurel32
Date: 2014-06-17 11:00:39 +0000 (Tue, 17 Jun 2014)
New Revision: 6167
Added:
glibc-package/trunk/debian/local/etc/ld.so.conf
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-bin.install
glibc-package/trunk/debian/debhelper.in/libc.postinst
Log:
debian/debhelper.in/libc.postinst: don't create/modify ld.so.conf,
but instead provide it as a conffile in libc-bin. Closes: #737588.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-06-17 10:20:04 UTC (rev 6166)
+++ glibc-package/trunk/debian/changelog 2014-06-17 11:00:39 UTC (rev 6167)
@@ -7,6 +7,8 @@
path even when the GNU triplet change.
* debian/debhelper.in/libc.{preinst,postrm,postinst}: remove old
ld.so configuration file on hurd-i386, i386 and kfreebsd-i386.
+ * debian/debhelper.in/libc.postinst: don't create/modify ld.so.conf,
+ but instead provide it as a conffile in libc-bin. Closes: #737588.
-- Aurelien Jarno <aurel32@debian.org> Mon, 16 Jun 2014 21:30:22 +0200
Modified: glibc-package/trunk/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.install 2014-06-17 10:20:04 UTC (rev 6166)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.install 2014-06-17 11:00:39 UTC (rev 6167)
@@ -1,4 +1,5 @@
debian/local/etc/bindresvport.blacklist etc
+debian/local/etc/ld.so.conf etc
debian/local/etc/ld.so.conf.d etc
debian/local/etc/nsswitch.conf usr/share/libc-bin
nis/nss etc/default
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2014-06-17 10:20:04 UTC (rev 6166)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2014-06-17 11:00:39 UTC (rev 6167)
@@ -70,16 +70,6 @@
if [ "$type" = "configure" ]
then
- # Add support for /etc/ld.so.conf.d
- if [ -e /etc/ld.so.conf ]; then
- [ -z "$(tail -n 1 /etc/ld.so.conf)" ] || echo >> /etc/ld.so.conf
- else
- touch /etc/ld.so.conf
- fi
- if ! grep -q '^include /etc/ld.so.conf.d/.*\.conf$' /etc/ld.so.conf ; then
- echo 'include /etc/ld.so.conf.d/*.conf' >> /etc/ld.so.conf
- fi
-
# We don't use a registry anymore, remove the old file
rm -f /etc/ld.so.hwcappkgs
Added: glibc-package/trunk/debian/local/etc/ld.so.conf
===================================================================
--- glibc-package/trunk/debian/local/etc/ld.so.conf (rev 0)
+++ glibc-package/trunk/debian/local/etc/ld.so.conf 2014-06-17 11:00:39 UTC (rev 6167)
@@ -0,0 +1,2 @@
+include /etc/ld.so.conf.d/*.conf
+
Reply to: