r1456 - in glibc-package/branches/glibc-2.4/debian: . script.in sysdeps
Author: schizo
Date: 2006-04-23 00:14:37 +0000 (Sun, 23 Apr 2006)
New Revision: 1456
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh
glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk
Log:
co-opt r1361 and r1409 from trunk (min kernel version to 2.4.1 except for
m68k)
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-04-23 00:09:02 UTC (rev 1455)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-04-23 00:14:37 UTC (rev 1456)
@@ -46,6 +46,9 @@
[ Aurelien Jarno ]
* Urgency set to medium because this version fixes and RC bug in testing.
+ * Bumped the minimum kernel to 2.4.1 instead of 2.4.0 as there are some
+ important new features in this version. Thanks to Petr Salinger for
+ noticing me.
* debian/sysdeps/sparc.mk: build sparcv9b optimized libraries with
-mtune=ultrasparc3.
@@ -60,6 +63,15 @@
into libc-bin-dev. (Closes: #330735)
* Put each test log file in the corresponding package instead of putting all
of them in libc6.
+ * Switch minimum kernel to at least 2.4.0 on all arches but m68k, and change
+ kernelcheck.sh accordingly. Affected architectures:
+ - alpha: from 2.2.0 to 2.4.0
+ - arm: from 2.2.0 to 2.4.0 (but 2.4.0 was checked at installed time)
+ - i386: from 2.2.0 to 2.4.0
+ - powerpc: from 2.2.0 to 2.4.0
+ - s390: from 2.2.10 to 2.4.0
+ - sparc: from 2.2.0 to 2.4.0
+ (Closes: #174270, #220992)
* Fix a typo in the description of the libc6-sparcv9 and libc6-sparcv9b
packages.
Modified: glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh
===================================================================
--- glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh 2006-04-23 00:09:02 UTC (rev 1455)
+++ glibc-package/branches/glibc-2.4/debian/script.in/kernelcheck.sh 2006-04-23 00:14:37 UTC (rev 1456)
@@ -52,6 +52,18 @@
#fi
fi
+ # The GNU libc is now built with --with-kernel= >= 2.4.1, except on m68k
+ if [ "$realarch" != m68k ]
+ then
+ if kernel_compare_versions "$kernel_ver" lt 2.4.1
+ then
+ echo WARNING: This version of glibc requires that you be running
+ echo kernel version 2.4.1 or later. Earlier kernels contained
+ echo bugs that may render the system unusable if a modern version
+ echo of glibc is installed.
+ exit_check
+ fi
+ fi
# SPARC sun4m requires a recent kernel
if [ "$realarch" = sparc ]
then
@@ -71,19 +83,6 @@
echo yourself from a kernel mirror \(see http://www.kernel.org/\).
exit_check
fi
- else
- if kernel_compare_versions "$kernel_ver" lt 2.2.0 #should be safe
- then
- echo WARNING: This version of glibc suggests atleast a
- echo 2.2.0 kernel in order to work properly. 2.0.x kernels
- echo will not be able to support certain functions and
- echo may cause problems. 2.2 kernels have proven to be much
- echo more reliable than 2.0.x kernels on the sparc platform
- echo anyway, so an upgrade is suggested. If you have a 2.1.x
- echo kernel is is suggested you upgrade to the latest 2.2
- echo release, since it is more stable and fixes many bugs.
- exit_check
- fi
fi
fi
# HPPA boxes require latest fixes in the kernel to function properly.
@@ -153,17 +152,3 @@
fi
fi
- # arm requires 2.4 kernel to avoid "obsolete calling standard" problem
- # with sys_llseek
- if [ "$realarch" = arm ] \
- && [ DEB_HOST_ARCH = arm ]
- then
- if kernel_compare_versions "$kernel_ver" lt 2.4.0
- then
- echo WARNING: This version of glibc requires that you be running
- echo kernel version 2.4.0 or later. Earlier kernels contained
- echo bugs that may render the system unusable if a modern version
- echo of glibc is installed.
- exit_check
- fi
- fi
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-04-23 00:09:02 UTC (rev 1455)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-04-23 00:14:37 UTC (rev 1456)
@@ -1,5 +1,5 @@
GLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
-MIN_KERNEL_SUPPORTED := 2.2.0
+MIN_KERNEL_SUPPORTED := 2.4.1
libc = libc6
# Support multiple makes at once based on number of processors
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-04-23 00:09:02 UTC (rev 1455)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-04-23 00:14:37 UTC (rev 1456)
@@ -1,3 +1,6 @@
+# m68k cannot be compiled with >= 2.4.xx
+MIN_KERNEL_SUPPORTED := 2.2.0
+
# work around to build on m68k, due to gcc-4.0 ICE. See #319312.
CC = gcc-3.4
BUILD_CC = gcc-3.4
Reply to: