[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r5441 - in glibc-package/branches/eglibc-2.17/debian: . debhelper.in



Author: adconrad
Date: 2013-01-16 03:54:44 +0000 (Wed, 16 Jan 2013)
New Revision: 5441

Modified:
   glibc-package/branches/eglibc-2.17/debian/changelog
   glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst
Log:
debian/debhelper.in/libc.preinst: Fix preinst kernel check to match
the reality that we need >= 2.6.32, as found in squeeze/lucid/RHEL6.

Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog	2013-01-11 05:16:38 UTC (rev 5440)
+++ glibc-package/branches/eglibc-2.17/debian/changelog	2013-01-16 03:54:44 UTC (rev 5441)
@@ -57,6 +57,8 @@
     as this has been fixed in the 3.7 release and 3.8 kernel headers.
   * debian/sysdeps/{amd64,i386}.mk: Fix rtlddir for x32 alternate builds.
   * debian/sysdeps/{armel,armhf}.mk: Merge multilib configs from Ubuntu.
+  * debian/debhelper.in/libc.preinst: Fix preinst kernel check to match
+    the reality that we need >= 2.6.32, as found in squeeze/lucid/RHEL6.
 
  -- Adam Conrad <adconrad@0c3.net>  Mon, 26 Nov 2012 02:20:40 -0700
 

Modified: glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst	2013-01-11 05:16:38 UTC (rev 5440)
+++ glibc-package/branches/eglibc-2.17/debian/debhelper.in/libc.preinst	2013-01-16 03:54:44 UTC (rev 5441)
@@ -371,18 +371,11 @@
             mips*) realarch="mips";;
         esac
 
-        # The GNU libc requires a >= 2.6.26 kernel, except on m68k where a
-        # 2.6.32 kernel is needed.
-        if [ "$realarch" != m68k ]
+        # The GNU libc requires a >= 2.6.32 kernel, found in squeeze/lucid/RHEL6
+        if linux_compare_versions "$kernel_ver" lt 2.6.32
         then
-            vmin=2.6.26
-        else
-            vmin=2.6.32
-        fi
-        if linux_compare_versions "$kernel_ver" lt ${vmin}
-        then
             echo WARNING: this version of the GNU libc requires kernel version
-            echo ${vmin} or later.  Please upgrade your kernel before installing
+            echo 2.6.32 or later.  Please upgrade your kernel before installing
             echo glibc.
             kernel26_help
 


Reply to: