r6783 - in glibc-package/trunk/debian: . debhelper.in sysdeps
Author: aurel32
Date: 2015-12-07 11:56:54 +0000 (Mon, 07 Dec 2015)
New Revision: 6783
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/i386.mk
Log:
* debian/sysdeps/amd64.mk, debian/sysdeps/i386.mk: downgrade the minimal
Linux kernel version to 2.6.32 to support RHEL6 kernels.
* debhelper.in/libc.preinst: add a note explainling that pre-3.2 kernel
are not officially supported.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-12-07 11:33:09 UTC (rev 6782)
+++ glibc-package/trunk/debian/changelog 2015-12-07 11:56:54 UTC (rev 6783)
@@ -4,6 +4,10 @@
* debian/debhelper.in/libc.{preinst,prerm}: remove code handling the
upgrade from squeeze to wheezy, as we don't support squeeze to stretch
upgrades. Move tests which might exit with a failure at the beginning.
+ * debian/sysdeps/amd64.mk, debian/sysdeps/i386.mk: downgrade the minimal
+ Linux kernel version to 2.6.32 to support RHEL6 kernels.
+ * debhelper.in/libc.preinst: add a note explainling that pre-3.2 kernel
+ are not officially supported.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-libpthread-api.diff: New patch, cleans libpthread
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2015-12-07 11:33:09 UTC (rev 6782)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2015-12-07 11:56:54 UTC (rev 6783)
@@ -147,23 +147,43 @@
# sanity checking for the appropriate kernel on each architecture.
kernel_ver=`uname -r`
+ case ${DPKG_MAINTSCRIPT_ARCH:-$(dpkg --print-architecture)} in
+ amd64|i386)
+ # The GNU libc requires a >= 2.6.32 kernel, found in squeeze or RHEL6
+ kernel_ver_min=2.6.32
+ # But we don't officially support kernels before 3.2
+ kernel_ver_rec=3.2
+ ;;
+ *)
+ # The GNU libc requires a >= 3.2 kernel, found in wheezy
+ kernel_ver_min=3.2
+ kernel_ver_rec=3.2
+ ;;
+ esac
- # The GNU libc requires a >= 3.2 kernel, found in wheezy
- if linux_compare_versions "$kernel_ver" lt 3.2
+ if linux_compare_versions "$kernel_ver" lt $kernel_ver_min
then
- echo WARNING: this version of the GNU libc requires kernel version
- echo 3.2 or later. Please upgrade your kernel before installing
- echo glibc.
+ echo "ERROR: This version of the GNU libc requires kernel version"
+ echo "$kernel_ver_rec or later. Please upgrade your kernel before installing"
+ echo "glibc."
exit 1
fi
+ if linux_compare_versions "$kernel_ver" lt $kernel_ver_rec
+ then
+ echo "WARNING: This version of the GNU libc requires kernel version"
+ echo "$kernel_ver_rec or later. Older versions might work but are not officially"
+ echo "supported. Please consider upgrading your kernel."
+ fi
+
elif [ $system = "GNU/kFreeBSD" ] ; then
kernel_ver=`uname -r`
- if kfreebsd_compare_versions "$kernel_ver" lt 8.3
+ kernel_ver_min=8.3
+ if kfreebsd_compare_versions "$kernel_ver" lt $kernel_ver_min
then
- echo WARNING: this version of the GNU libc requires kernel version
- echo 8.3 or later. Please upgrade your kernel before installing
- echo glibc.
+ echo "ERROR: This version of the GNU libc requires kernel version"
+ echo "$kernel_ver_min or later. Please upgrade your kernel before installing"
+ echo "glibc."
exit 1
fi
fi
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2015-12-07 11:33:09 UTC (rev 6782)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2015-12-07 11:56:54 UTC (rev 6783)
@@ -1,5 +1,6 @@
libc_rtlddir = /lib64
extra_config_options = --enable-multi-arch --enable-lock-elision
+MIN_KERNEL_SUPPORTED := 2.6.32
# build 32-bit (i386) alternative library
GLIBC_MULTILIB_PASSES += i386
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2015-12-07 11:33:09 UTC (rev 6782)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2015-12-07 11:56:54 UTC (rev 6783)
@@ -1,4 +1,5 @@
extra_config_options = --enable-multi-arch --enable-lock-elision
+MIN_KERNEL_SUPPORTED := 2.6.32
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
Reply to: