xtables-addons: update to 2.11

[openwrt-github/.git] / package / network / utils / xtables-addons / patches / 002-fix-kernel-version-detection.patch

diff --git a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
index 8dc63844787b50b4580ca9d5e1afbb5986a2d710..775ccf657cb22afca4ef99d9ba6fa5dee34d71fa 100644 (file)
--- a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
+++ b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
@@ -1,22 +1,11 @@
---- a/configure
-+++ b/configure
-@@ -11892,7 +11892,7 @@ regular_CFLAGS="-Wall -Waggregate-return
- if test -n "$kbuilddir"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5
- $as_echo_n "checking kernel version that we will build against... " >&6; }
--      krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
-+      krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
-       kmajor="${krel%%[^0-9]*}";
-       kmajor="$(($kmajor+0))";
-       krel="${krel:${#kmajor}}";
 --- a/configure.ac
 +++ b/configure.ac
 @@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
  
  if test -n "$kbuilddir"; then
        AC_MSG_CHECKING([kernel version that we will build against])
--      krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
-+      krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
-       kmajor="${krel%%[[^0-9]]*}";
-       kmajor="$(($kmajor+0))";
-       krel="${krel:${#kmajor}}";
+-      krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
++      krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"
+       save_IFS="$IFS"
+       IFS='.'
+       set x $krel