From f357c380cb0ad596e6a2ff004dacb620bf9856bb Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 3 Feb 2020 22:49:18 +0100 Subject: debian/debhelper.in/libc.{preinst,postrm}: Remove fallback to dpkg --print-architecture for pre-multiarch systems. --- debian/changelog | 7 +++++++ debian/debhelper.in/libc.postrm | 2 +- debian/debhelper.in/libc.preinst | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e50d8efb..30dae065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +glibc (2.29-10) UNRELEASED; urgency=medium + + * debian/debhelper.in/libc.{preinst,postrm}: Remove fallback to dpkg + --print-architecture for pre-multiarch systems. + + -- Aurelien Jarno Mon, 03 Feb 2020 22:48:09 +0100 + glibc (2.29-9) unstable; urgency=medium [ Samuel Thibault ] diff --git a/debian/debhelper.in/libc.postrm b/debian/debhelper.in/libc.postrm index 2990095a..4c5cc6e0 100644 --- a/debian/debhelper.in/libc.postrm +++ b/debian/debhelper.in/libc.postrm @@ -5,7 +5,7 @@ if [ "$1" = remove ]; then # When both the multiarch and the corresponding biarch packages are # installed, removing the multiarch package will remove the dynamic # linker. Recreate it in the postinst. - ARCH=${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} + ARCH=${DPKG_MAINTSCRIPT_ARCH} case "${ARCH}" in kfreebsd-i386 | s390 | powerpc) target="/lib32/ld.so.1" diff --git a/debian/debhelper.in/libc.preinst b/debian/debhelper.in/libc.preinst index f321e652..44ab8547 100644 --- a/debian/debhelper.in/libc.preinst +++ b/debian/debhelper.in/libc.preinst @@ -143,7 +143,7 @@ then # sanity checking for the appropriate kernel on each architecture. kernel_ver=`uname -r` - case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in + case ${DPKG_MAINTSCRIPT_ARCH} in *) # The GNU libc requires a >= 3.2 kernel, found in wheezy kernel_ver_min=3.2 -- cgit v1.2.3