+++ /dev/null
-Index: iptables-1.3.3/extensions/Makefile
-===================================================================
---- iptables-1.3.3.orig/extensions/Makefile
-+++ iptables-1.3.3/extensions/Makefile
-@@ -67,10 +67,10 @@ endif
-
- ifdef NO_SHARED_LIBS
- extensions/libext.a: $(EXT_OBJS)
-- rm -f $@; ar crv $@ $(EXT_OBJS)
-+ rm -f $@; $(AR) crv $@ $(EXT_OBJS)
-
- extensions/libext6.a: $(EXT6_OBJS)
-- rm -f $@; ar crv $@ $(EXT6_OBJS)
-+ rm -f $@; $(AR) crv $@ $(EXT6_OBJS)
-
- extensions/initext.o: extensions/initext.c
- extensions/initext6.o: extensions/initext6.c
PARALLEL_MAKE = ""
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-inherit autotools
-
-#do_compile () {
-# oe_runmake DESTDIR=${D} NO_SHARED_LIBS=1
-#}
-
-#do_install () {
-# oe_runmake DESTDIR=${D} install NO_SHARED_LIBS=1
-#}
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
+CFLAGS += "-Du32=__u32"
+RPROVIDES_${PN} += "iptables-utils"
+FILES_${PN}-dbg += "${libexecdir}/xtables/.debug"
FILES_${PN}-doc += "${mandir}"
-FILES_${PN}-dbg += "${libexecdir}/xtables/.debug/*"
RRECOMMENDS = "\
kernel-module-ip-tables \
require iptables.inc
PR = "${INC_PR}.0"
+EXTRA_OEMAKE = "'COPT_FLAGS=${CFLAGS}' \
+ 'KERNEL_DIR=${STAGING_INCDIR}' \
+ 'LDFLAGS=${LDFLAGS}' \
+ ${@base_contains('DISTRO_FEATURES', 'ipv6', 'DO_IPV6=1', 'DO_IPV6=0', d)} \
+ \
+ 'PREFIX=${prefix}' \
+ 'LIBDIR=${libdir}' \
+ 'BINDIR=${sbindir}' \
+ 'MANDIR=${mandir}' \
+ 'INCDIR=${includedir}'"
+CFLAGS[unexport] = "1"
SRC_URI += "\
file://getsockopt-failed.patch;patch=1 \
file://cross-iptables.diff;patch=1 \
"
+do_install () {
+ oe_runmake 'DESTDIR=${D}' install
+}
require iptables.inc
+inherit autotools
+EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
+ ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
+
PR = "${INC_PR}.0"
SRC_URI += "\