From 76aaa52c2df1fbce13c5df8cd3b718b47eb2fd29 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sun, 22 Aug 2021 17:35:49 +0100 Subject: [PATCH] build: bump minimum supported kernel version from 4.15 to 4.16 The next two commits make use of a function and macro that were introduced in 4.16. --- INSTALL | 5 +++-- configure.ac | 2 +- extensions/compat_xtables.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 4732065..c4f8b07 100644 --- a/INSTALL +++ b/INSTALL @@ -14,7 +14,7 @@ Supported configurations for this release * iptables >= 1.6.0 - * kernel-devel >= 4.15 + * kernel-devel >= 4.16 with prepared build/output directory - CONFIG_NF_CONNTRACK - CONFIG_NF_CONNTRACK_MARK enabled =y or as module (=m) @@ -22,7 +22,8 @@ Supported configurations for this release notifications from pknock through netlink/connector (Use xtables-addons-1.x if you need support for Linux < 3.7. -Use xtables-addons-2.x if you need support for Linux < 4.15.) +Use xtables-addons-2.x if you need support for Linux < 4.15. +Use xtables-addons<3.19 if you need support for Linux <=4.16.) Note: xtables-addons regularly fails to build with patched-to-death kernels like on RHEL or SLES because the API does not match LINUX_KERNEL_VERSION anymore. diff --git a/configure.ac b/configure.ac index 7612924..9705d75 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ if test -n "$kbuilddir"; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; elif test "$kmajor" -eq 5 -a "$kminor" -ge 0; then : - elif test "$kmajor" -eq 4 -a "$kminor" -ge 15; then + elif test "$kmajor" -eq 4 -a "$kminor" -ge 16; then : else echo "WARNING: That kernel version is not officially supported."; diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index 44ea7d3..eff3bde 100644 --- a/extensions/compat_xtables.h +++ b/extensions/compat_xtables.h @@ -5,8 +5,8 @@ #define DEBUGP Use__pr_debug__instead -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) -# warning Kernels below 4.15 not supported. +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) +# warning Kernels below 4.16 not supported. #endif #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) -- 2.47.2