r5183 - in glibc-package/trunk/debian: . debhelper.in rules.d
Author: adconrad
Date: 2012-04-16 08:45:31 +0000 (Mon, 16 Apr 2012)
New Revision: 5183
Added:
glibc-package/trunk/debian/debhelper.in/libc-alt.postrm
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postrm
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Hackish workaround for i386 multiarch/multilib PI disappearing tricks (plus a small fix for the RTLD_SO replacement)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-04-01 16:32:16 UTC (rev 5182)
+++ glibc-package/trunk/debian/changelog 2012-04-16 08:45:31 UTC (rev 5183)
@@ -1,5 +1,10 @@
eglibc (2.13-28) UNRELEASED; urgency=low
+ [ Adam Conrad ]
+ * debian/rules.d/debhelper.mk: Fix RTLD_SO replacement regex for sanity.
+ * debian/debhelper.in/libc{,-alt}.postrm: If we remove libc6:i386 before
+ libc6-i386:amd64, maintain sanity of /lib/ld-linux.so.2 (LP: #852101)
+
[ Samuel Thibault ]
* patches/hurd-i386/tg-symlink_dealloc.diff: New patch from Ludovic Courtès
to fix port deallocation on symlink creation failure.
Added: glibc-package/trunk/debian/debhelper.in/libc-alt.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.postrm (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.postrm 2012-04-16 08:45:31 UTC (rev 5183)
@@ -0,0 +1,19 @@
+#! /bin/sh
+set -e
+
+if [ "$1" = remove ]; then
+ ARCH=${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)}
+ if [ "${ARCH}" = "amd64" ] && [ "LIBC-FLAVOR" = "libc6-i386" ]; then
+ if [ -h /lib/ld-linux.so.2 ] && [ ! -f /lib/ld-linux.so.2 ]; then
+ rm /lib/ld-linux.so.2
+ fi
+ fi
+fi
+
+if [ "$1" = deconfigure ]; then
+ :; # blah, do something useful with ldso
+fi
+
+#DEBHELPER#
+
+exit 0
Modified: glibc-package/trunk/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postrm 2012-04-01 16:32:16 UTC (rev 5182)
+++ glibc-package/trunk/debian/debhelper.in/libc.postrm 2012-04-16 08:45:31 UTC (rev 5183)
@@ -9,6 +9,14 @@
suidunregister -s LIBC /usr/libexec/pt_chown
fi
fi
+ ARCH=${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)}
+ if [ "${ARCH}" = "i386" ]; then
+ if [ -f /lib32/ld-linux.so.2 ] && [ ! -f /lib/ld-linux.so.2 ]; then
+ ln -sf /lib32/ld-linux.so.2 /lib/ld-linux.so.2
+ elif [ -h /lib/ld-linux.so.2 ] && [ ! -f /lib/ld-linux.so.2 ]; then
+ rm /lib/ld-linux.so.2
+ fi
+ fi
fi
if [ "$1" = deconfigure ]; then
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2012-04-01 16:32:16 UTC (rev 5182)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2012-04-16 08:45:31 UTC (rev 5183)
@@ -221,7 +221,7 @@
sed -e "s#SLIBDIR#$$slibdir#g" -i $$t; \
sed -e "s#LIBDIR#$$libdir#g" -i $$t; \
sed -e "s#FLAVOR#$$curpass#g" -i $$t; \
- sed -e "s#RTLD_SO#$$rtld_so#" -i $$t ; \
+ sed -e "s#RTLD_SO#$$rtld_so#g" -i $$t ; \
done ; \
done
Reply to: