- release 8

[packages/xtables-addons.git] / kernelrelease.patch

diff --git a/kernelrelease.patch b/kernelrelease.patch
index 33c71c9d961b9599008c4af8c0c1152ad550d75f..ec7206991b70d77d151eb25276b0185cd5d236e7 100644 (file)
--- a/kernelrelease.patch
+++ b/kernelrelease.patch
@@ -1,8 +1,8 @@
---- xtables-addons-1.15/configure.ac~  2009-04-30 18:58:23.000000000 +0000
-+++ xtables-addons-1.15/configure.ac   2009-06-03 00:16:46.747444821 +0000
-@@ -63,37 +63,6 @@ if [[ -n "$ksourcedir" ]]; then
-       kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
- fi;
+--- xtables-addons-1.31/configure.ac~  2010-12-02 22:13:08.366366978 +0100
++++ xtables-addons-1.31/configure.ac   2010-12-02 22:14:14.780561896 +0100
+@@ -39,47 +39,6 @@
+       -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+       -I\${XA_TOPSRCDIR}/include";
  
 -#
 -# check kernel version
@@ -13,6 +13,7 @@
 -      # Well, just a warning. Maybe the admin updated the kernel.
 -      echo "WARNING: This distribution's shipped kernel is not supported.";
 -fi;
+-AC_MSG_CHECKING([kernel version that we will build against])
 -krel="$(make -sC ${kbuilddir} kernelrelease)";
 -krel="${krel%%-*}";
 -kmajor="${krel%%.*}";
@@ -20,21 +21,30 @@
 -kminor="${krel%%.*}";
 -krel="${krel#*.}";
 -kmicro="${krel%%.*}";
--krel="${krel#*.}";
--kstable="${krel%%.*}";
--if test -z "$kstable"; then
+-if test "$kmicro" = "$krel"; then
+-      kmicro="$(($kmicro+0))"; # Get rid of non numbers ("2.6.36+" -> "2.6.36")
 -      kstable=0;
+-else
+-      kmicro="$(($kmicro+0))";
+-      kstable="${krel#*.}";
+-      kstable="$(($kstable+0))";
 -fi;
--echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 30; then
--      echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
--elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \
--    \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
--    "$kstable" -lt 5 \); then
--      echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
--      exit 1;
+-if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then
+-      echo "WARNING: Version detection did not succeed. Continue at own luck.";
+-else
+-      echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
+-      if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then
+-              echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
+-      elif test \( "$kmajor" -lt 2 -o \
+-          \( "$kmajor" -eq 2 -a "$kminor" -lt 6 \) -o \
+-          \( "$kmajor" -eq 2 -a "$kminor" -eq 0 -a "$kmicro" -lt 17 \) -o \
+-          \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
+-          "$kstable" -lt 5 \) \); then
+-              echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
+-              exit 1;
+-      fi;
 -fi;
 -
  AC_SUBST([regular_CFLAGS])
- AC_SUBST([xtables_CFLAGS])
- AC_SUBST([kinclude_CFLAGS])
+ AC_SUBST([kbuilddir])
+ AC_SUBST([xtlibdir])