[oe-commits] Roman I Khimov : iptables 1.4.9.1: DEPENDS on libnfnetlink

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a9090f72a992140e6b6010a70c72a3e91a9e37c9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a9090f72a992140e6b6010a70c72a3e91a9e37c9

Author: Roman I Khimov <khimov at altell.ru>
Date:   Wed Aug 25 11:07:51 2010 +0400

iptables 1.4.9.1: DEPENDS on libnfnetlink

Actually, it can be built with and without libnfnetlink support.
libnfnetlink-enabled build enables nfnl_osf utility for passive OS
fingerprinting and pf.os is its 'database', so it shouldn't be moved to
documents. Just build with it and package separately.

Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/iptables/iptables_1.4.9.1.bb |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/recipes/iptables/iptables_1.4.9.1.bb b/recipes/iptables/iptables_1.4.9.1.bb
index b51c5a4..8119016 100644
--- a/recipes/iptables/iptables_1.4.9.1.bb
+++ b/recipes/iptables/iptables_1.4.9.1.bb
@@ -1,15 +1,16 @@
 require iptables.inc
+
+DEPENDS += "libnfnetlink"
+
 inherit autotools
 EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
                 ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI[iptables-1.4.9.1.md5sum] = "fbadfb0b5f2dbda49e0ad06a798898e3"
 SRC_URI[iptables-1.4.9.1.sha256sum] = "0550f7ba7a170811dcf9b2df65036999786d84040b767238effc40232f617839"
 
-do_install_append() {
-	install -d ${D}${docdir}/xtables
-	mv ${D}${datadir}/xtables/* ${D}${docdir}/xtables/ || echo "No ${D}${datadir}/xtables/* here"
-	rm -fr ${D}${datadir}/xtables
-}
+PACKAGES =+ "${PN}-osf"
+
+FILES_${PN}-osf = "${sbindir}/nfnl_osf ${datadir}/xtables"