Patchwork [10/10] iptables: include /usr/share/xtables/pf.os in PN if it's build

login
register
mail settings
Submitter Martin Jansa
Date Dec. 14, 2012, 11:40 p.m.
Message ID <d503f2e963cffbb534a2ee4e7f8255d46f65789e.1355475937.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/41077/
State Accepted
Commit 8c577660151814a23d89811aeb8ded2663854773
Headers show

Comments

Martin Jansa - Dec. 14, 2012, 11:40 p.m.
* when libnfnetlink is available (provided by
  meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb
  it's autodetected and utils subdirectory with pf.os is used.
* unfortunately there isn't configure switch to explicitly disable
  libnfnetlink and it's also in different layer so we cannot add it to
  DEPENDS
* it's undeterminitic, but pf.os is the only difference AFAIK, so not
  worth patching configure switch
* fixes:
  iptables-1.4.15: iptables: Files/directories were installed but not
  shipped
    /usr/share/xtables
    /usr/share/xtables/pf.os

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/iptables/iptables_1.4.15.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-extended/iptables/iptables_1.4.15.bb b/meta/recipes-extended/iptables/iptables_1.4.15.bb
index a6297f3..d556c77 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.15.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.15.bb
@@ -7,7 +7,7 @@  LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\
                     file://iptables/iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef"
 
-PR = "r0"
+PR = "r1"
 
 RRECOMMENDS_${PN} = "kernel-module-x-tables \
                      kernel-module-ip-tables \
@@ -18,7 +18,7 @@  RRECOMMENDS_${PN} = "kernel-module-x-tables \
                      kernel-module-nf-conntrack-ipv4 \
                      kernel-module-nf-nat \
                      kernel-module-ipt-masquerade"
-FILES_${PN} =+ "${libdir}/xtables/"
+FILES_${PN} =+ "${libdir}/xtables/ ${datadir}/xtables"
 FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
 
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \