Author: aurel32
Date: 2015-12-03 22:54:10 +0000 (Thu, 03 Dec 2015)
New Revision: 6765
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.NEWS
glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
glibc-package/branches/glibc-2.22/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
Log:
* debhelper.in/libc.preinst: drop outdated code about pre-2.6 kernels.
* rules.d/debhelper.mk: prefix calls to objcopy and strip with
$(DEB_HOST_GNU_TYPE)-.
* testsuite-checking/expected-results-hppa-linux-gnu-libc: update testsuite
result, from John David Anglin. Closes: #806839.
* debhelper.in/libc.NEWS: add an entry about the required minimum kernel.
* rules.d/debhelper.mk: strip *crt*.o files.
* patches/any/cvs-tls-dtv.diff: update with a new patch from upstream
changing the IE model for static variables. Closes: #806971.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-03 22:44:43 UTC
(rev 6764)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-03 22:54:10 UTC
(rev 6765)
@@ -114,6 +114,21 @@
-- Aurelien Jarno <aure...@debian.org> Wed, 02 Dec 2015 00:06:13 +0100
+glibc (2.21-2) unstable; urgency=medium
+
+ [ Aurelien Jarno ]
+ * debhelper.in/libc.preinst: drop outdated code about pre-2.6 kernels.
+ * rules.d/debhelper.mk: prefix calls to objcopy and strip with
+ $(DEB_HOST_GNU_TYPE)-.
+ * testsuite-checking/expected-results-hppa-linux-gnu-libc: update testsuite
+ result, from John David Anglin. Closes: #806839.
+ * debhelper.in/libc.NEWS: add an entry about the required minimum kernel.
+ * rules.d/debhelper.mk: strip *crt*.o files.
+ * patches/any/cvs-tls-dtv.diff: update with a new patch from upstream
+ changing the IE model for static variables. Closes: #806971.
+
+ -- Aurelien Jarno <aure...@debian.org> Thu, 03 Dec 2015 22:46:21 +0100
+
glibc (2.21-1) unstable; urgency=medium
[ Aurelien Jarno ]
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.NEWS
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.NEWS
2015-12-03 22:44:43 UTC (rev 6764)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.NEWS
2015-12-03 22:54:10 UTC (rev 6765)
@@ -1,3 +1,21 @@
+glibc (2.21-2) unstable; urgency=medium
+
+ Starting with version 2.21-1, the glibc requires a 3.2 or later Linux
+ kernel. If you use an older kernel, please upgrade it *before*
+ installing this glibc version. Failing to do so will end-up with the
+ following failure:
+
+ Preparing to unpack .../libc6_2.21-1_amd64.deb ...
+ Checking for services that may need to be restarted...
+ Checking init scripts...
+ WARNING: this version of the GNU libc requires kernel version
+ 3.2 or later. Please upgrade your kernel before installing
+ glibc.
+
+ Note: This obviously does not apply to non-Linux kernels.
+
+ -- Aurelien Jarno <aure...@debian.org> Thu, 03 Dec 2015 22:46:21 +0100
+
eglibc (2.13-25) unstable; urgency=medium
Starting with the eglibc package version 2.13-5, the libraries are
Modified: glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
2015-12-03 22:44:43 UTC (rev 6764)
+++ glibc-package/branches/glibc-2.22/debian/debhelper.in/libc.preinst
2015-12-03 22:54:10 UTC (rev 6765)
@@ -28,15 +28,6 @@
test $verA -$2 $verB
}
-kernel26_help() {
- echo ""
- echo "The installation of a 2.6 kernel _could_ ask you to install a new
libc"
- echo "first, this is NOT a bug, and should *NOT* be reported. In that
case,"
- echo "please add lenny sources to your /etc/apt/sources.list and run:"
- echo " apt-get install -t lenny linux-image-2.6"
- echo "Then reboot into this new kernel, and proceed with your upgrade"
-}
-
# Sanity check.
# If there are versions of glibc outside of the normal installation
# location (/lib, /lib64, etc.) then things may break very badly
@@ -324,18 +315,6 @@
exit 1
fi
- if [ -n "$LD_ASSUME_KERNEL" ] ; then
- if dpkg --compare-versions "$LD_ASSUME_KERNEL" le "2.6.1"; then
- echo
- echo "POSIX threads library NPTL requires kernel version 2.6.1"
- echo "or later. It appears that LD_ASSUME_KERNEL is set to
$LD_ASSUME_KERNEL."
- echo "It is not safe to upgrade the C library in this situation;"
- echo "Please unset this environment variable and try again."
- echo
- exit 1
- fi
- fi
-
# glibc kernel version check
system=`uname -s`
if [ "$system" = "Linux" ]
@@ -364,8 +343,6 @@
echo WARNING: this version of the GNU libc requires kernel version
echo 3.2 or later. Please upgrade your kernel before installing
echo glibc.
- kernel26_help
-
exit 1
fi
Modified: glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
2015-12-03 22:44:43 UTC (rev 6764)
+++ glibc-package/branches/glibc-2.22/debian/rules.d/debhelper.mk
2015-12-03 22:54:10 UTC (rev 6765)
@@ -55,10 +55,15 @@
-e "s#^.*Build ID:
\([0-9a-f]\{2\}\)\([0-9a-f]\+\)#\1/\2.debug#") ; \
dbgpath=debian/$(libc)-dbg/usr/lib/debug/.build-id/$$dbgfile ;
\
mkdir -p $$(dirname $$dbgpath) ;
\
- objcopy --only-keep-debug $$f $$dbgpath ;
\
- objcopy --add-gnu-debuglink=$$dbgpath $$f ;
\
- strip --strip-debug --remove-section=.comment
--remove-section=.note $$f ;\
+ $(DEB_HOST_GNU_TYPE)-objcopy --only-keep-debug $$f $$dbgpath ;
\
+ $(DEB_HOST_GNU_TYPE)-objcopy --add-gnu-debuglink=$$dbgpath $$f ;
\
+ $(DEB_HOST_GNU_TYPE)-strip --strip-debug
--remove-section=.comment \
+ --remove-section=.note $$f ;
\
done ;
\
+ for f in $$(find debian/$(curpass) -name \*crt\*.o) ; do
\
+ $(DEB_HOST_GNU_TYPE)-strip --strip-debug
--remove-section=.comment \
+ --remove-section=.note $$f ;
\
+ done ;
\
else
\
dh_strip -p$(curpass) -Xlibpthread;
\
fi
\
Modified:
glibc-package/branches/glibc-2.22/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
===================================================================
---
glibc-package/branches/glibc-2.22/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
2015-12-03 22:44:43 UTC (rev 6764)
+++
glibc-package/branches/glibc-2.22/debian/testsuite-checking/expected-results-hppa-linux-gnu-libc
2015-12-03 22:54:10 UTC (rev 6765)
@@ -57,12 +57,15 @@
elf/check-textrel
elf/tst-addr1
elf/tst-audit2
+malloc/tst-trim1
math/test-double
math/test-float
math/test-idouble
math/test-ifloat
nptl/tst-attr3
+nptl/tst-cancel3
nptl/tst-cancel4
+nptl/tst-cancel4
nptl/tst-cancel5
nptl/tst-cancelx20
nptl/tst-cancelx21
