From 6d74f76a29901b752a03821542ae72f69cdc20fc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 16 Oct 2012 03:21:01 +0200 Subject: [PATCH] build: remove support for Linux 3.0 --- INSTALL | 2 +- configure.ac | 2 +- doc/changelog.txt | 2 +- extensions/compat_xtables.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 9d049ab..ef789aa 100644 --- a/INSTALL +++ b/INSTALL @@ -14,7 +14,7 @@ Supported configurations for this release * iptables >= 1.4.5 - * kernel-devel >= 3.0 + * kernel-devel >= 3.1 with prepared build/output directory - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK diff --git a/configure.ac b/configure.ac index 6318610..6258272 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ if test -n "$kbuilddir"; then echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 6; then echo "WARNING: That kernel version is not officially supported."; - elif test "$kmajor" -eq 3 -a "$kminor" -ge 0; then + elif test "$kmajor" -eq 3 -a "$kminor" -ge 1; then :; else echo "WARNING: That kernel version is not officially supported."; diff --git a/doc/changelog.txt b/doc/changelog.txt index d90b97f..af37fb9 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -2,7 +2,7 @@ HEAD ==== Changes: -- remove support for Linux 2.6.17–2.6.39 +- remove support for Linux 2.6.17–3.0 - remove xt_TEE (this is available upstream since 2.6.35) - remove xt_CHECKSUM (this is available upstream since 2.6.36) diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index 85fa226..af678f1 100644 --- a/extensions/compat_xtables.h +++ b/extensions/compat_xtables.h @@ -8,8 +8,8 @@ #define DEBUGP Use__pr_debug__instead -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) -# warning Kernels below 3.0 not supported. +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) +# warning Kernels below 3.1 not supported. #endif #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)