This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 802190a104e14e5c79755720dcb42ad2025d4ecf
Author: Aurelien Jarno <aurel...@aurel32.net>
Date: Wed Nov 22 00:13:48 2017 +0100
debian/script.in/nohwcap.sh: always check for all optimized packages as
multiarch allows one to install foreign architectures. Closes: #882272.
---
debian/changelog | 3 +++
debian/script.in/nohwcap.sh | 30 ++++++++----------------------
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1b70c9d..bfa64ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ glibc (2.25-2) UNRELEASED; urgency=medium
* debian/patches/git-updates.diff: update from upstream stable branch:
- Don't use IFUNC resolver for longjmp or system in libpthread.
Closes: #882336.
+ * debian/script.in/nohwcap.sh: always check for all optimized packages
+ as multiarch allows one to install foreign architectures. Closes:
+ #882272.
[ YunQiang Su ]
* Add symbol files for mipsn32 and mips64.
diff --git a/debian/script.in/nohwcap.sh b/debian/script.in/nohwcap.sh
index 163327d..b22f407 100644
--- a/debian/script.in/nohwcap.sh
+++ b/debian/script.in/nohwcap.sh
@@ -3,30 +3,16 @@
# from /lib, and ignore all optimised libraries. This file is
# inconditionaly created in the preinst script of libc.
- # Get the list of optimized packages for a given architecture
- # Before removing a package from this list, make sure it appears
- # in the Conflicts: line of libc.
- case ${DPKG_MAINTSCRIPT_ARCH} in
- alpha)
- hwcappkgs="libc6.1-alphaev67"
- ;;
- i386)
- hwcappkgs="libc6-xen"
- ;;
- esac
-
# We check the version between the current installed libc and
- # all optimized packages (on architectures where such packages
- # exists).
+ # all optimized packages. Due to multiarch, this has to be done
+ # independently of the architecture of the package.
all_upgraded=yes
- if [ -n "$hwcappkgs" ]; then
- for pkg in $hwcappkgs ; do
- ver=$(dpkg-query -l $pkg 2>/dev/null | sed -e
'/^[a-z][a-z]\s/!d;/^.[nc]/d;' -e "s/^..\s\+$pkg[0-9a-z:]*\s\+//;s/\s.*//g")
- if [ -n "$ver" ] && [ "$ver" != "CURRENT_VER" ]; then
- all_upgraded=no
- fi
- done
- fi
+ for pkg in libc6.1-alphaev67 libc6-xen ; do
+ ver=$(dpkg-query -l $pkg 2>/dev/null | sed -e
'/^[a-z][a-z]\s/!d;/^.[nc]/d;' -e "s/^..\s\+$pkg[0-9a-z:]*\s\+//;s/\s.*//g")
+ if [ -n "$ver" ] && [ "$ver" != "CURRENT_VER" ]; then
+ all_upgraded=no
+ fi
+ done
# If the versions of all optimized packages are the same as the libc
# one, we could remove /etc/ld.so.nohwcap. Otherwise, it will be removed
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
