iptables 1.3.8 factor out .inc, remove some versions, add recommendation to nat iptable module

4 files changed, 6 insertions, 115 deletions

diff --git a/packages/iptables/iptables_1.2.11.bb b/packages/iptables/iptables_1.2.11.bb
deleted file mode 100644
index 0d6d8ccadf..0000000000
--- a/packages/iptables/iptables_1.2.11.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "iptables network filtering tools"
-HOMEPAGE = "http://www.netfilter.org/"
-SECTION = "console/utils"
-LICENSE = "GPL"
-PR = "r1"
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${bindir}/iptables-save ${bindir}/iptables-restore"
-
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
-
-S = "${WORKDIR}/iptables-${PV}"
-
-PARALLEL_MAKE=""
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
-}
-
-do_install () {
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
-}
-
-FILES_${PN}-doc += "${mandir}"
-
diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb
deleted file mode 100644
index 213802d17f..0000000000
--- a/packages/iptables/iptables_1.2.9.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "iptables network filtering tools"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
-	   file://compile.patch;patch=1"
-
-S = "${WORKDIR}/iptables-${PV}"
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man NO_SHARED_LIBS=1
-}
-
-do_install () {
-#	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man install NO_SHARED_LIBS=1
-}
diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb
deleted file mode 100644
index 5f19d45317..0000000000
--- a/packages/iptables/iptables_1.3.3.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "iptables network filtering tools"
-HOMEPAGE = "http://www.netfilter.org/"
-SECTION = "console/utils"
-LICENSE = "GPL"
-RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r4"
-
-
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
-
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
-	   file://compile.patch;patch=1"
-
-S = "${WORKDIR}/iptables-${PV}"
-
-PARALLEL_MAKE=""
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
-}
-
-do_install () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
-}
-
-FILES_${PN}-doc += "${mandir}"
-
diff --git a/packages/iptables/iptables_1.3.8.bb b/packages/iptables/iptables_1.3.8.bb
index 8dfb6c7842..4475402df8 100644
--- a/packages/iptables/iptables_1.3.8.bb
+++ b/packages/iptables/iptables_1.3.8.bb
@@ -1,32 +1,8 @@
-DESCRIPTION = "iptables network filtering tools"
-HOMEPAGE = "http://www.netfilter.org/"
-SECTION = "console/utils"
-LICENSE = "GPL"
-RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r2"
-SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
-          file://getsockopt-failed.patch;patch=1 \
-          file://iptables-use-s6_addr32.patch;patch=1 \
-          "
+require iptables.inc
+PR = "r3"
 
-S = "${WORKDIR}/iptables-${PV}"
-
-PARALLEL_MAKE=""
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
-}
-
-do_install () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
-}
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
-FILES_${PN}-doc += "${mandir}"
+SRC_URI += "\
+  file://getsockopt-failed.patch;patch=1 \
+  file://iptables-use-s6_addr32.patch;patch=1 \
+"