From 7c6170178d03c6f6ac555989a7d324b3679454e7 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 2 May 2015 17:31:34 +0200 Subject: [PATCH 1/2] ulogd: Add RDEPENS to respective kernel modules some sub-packages of ulogd don't make sense without the corresponding kernel modules --- recipes-extra/ulogd/ulogd_2.0.4.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-extra/ulogd/ulogd_2.0.4.bb b/recipes-extra/ulogd/ulogd_2.0.4.bb index cd9d92c8e8..71540a2af2 100644 --- a/recipes-extra/ulogd/ulogd_2.0.4.bb +++ b/recipes-extra/ulogd/ulogd_2.0.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.netfilter.org/projects/ulogd/index.html" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" DEPENDS = "libnfnetlink libnetfilter-log libnetfilter-conntrack libmnl libnetfilter-acct sqlite3 jansson" -PR = "r2" +PR = "r3" SRC_URI = " \ http://www.netfilter.org/projects/ulogd/files/ulogd-${PV}.tar.bz2;name=tar \ @@ -26,9 +26,16 @@ do_install_append() { PACKAGES =+ "ulogd-in-nfacct ulogd-in-nfct ulogd-in-nflog ulogd-in-ulog ulogd-out-sqlite3 ulogd-out-json ulogd-out-pcap" FILES_ulogd-in-nfacct = "${libdir}/ulogd/ulogd_inpflow_NFACCT.so" +RDEPENDS_ulogd-in-nfacct += "kernel-module-nfnetlink-acct kernel-module-xt-nfacct" + FILES_ulogd-in-nfct = "${libdir}/ulogd/ulogd_inpflow_NFCT.so" +RDEPENDS_ulogd-in-nfct += "kernel-module-nf-conntrack-netlink" + FILES_ulogd-in-nflog = "${libdir}/ulogd/ulogd_inppkt_NFLOG.so" +RDEPENDS_ulogd-in-nflog += "kernel-module-nfnetlink-log kernel-module-xt-nflog" + FILES_ulogd-in-ulog = "${libdir}/ulogd/ulogd_inppkt_ULOG.so" + FILES_ulogd-out-sqlite3 = "${libdir}/ulogd/ulogd_output_SQLITE3.so" FILES_ulogd-out-json = "${libdir}/ulogd/ulogd_output_JSON.so" FILES_ulogd-out-pcap = "${libdir}/ulogd/ulogd_output_PCAP.so" From 6938804c99f4e86d917bc504701219ad978f611e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 2 May 2015 17:33:40 +0200 Subject: [PATCH 2/2] nfacct: Add RDEPENDS to kernel modules nfacct in userspace doesn't work without its kernel counterparts.. --- recipes-extra/nfacct/nfacct_1.0.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-extra/nfacct/nfacct_1.0.1.bb b/recipes-extra/nfacct/nfacct_1.0.1.bb index f56e49be2c..5f967c5cbf 100644 --- a/recipes-extra/nfacct/nfacct_1.0.1.bb +++ b/recipes-extra/nfacct/nfacct_1.0.1.bb @@ -9,4 +9,6 @@ SRC_URI = "http://www.netfilter.org/projects/${PN}/files/${PN}-${PV}.tar.bz2;nam SRC_URI[tar.md5sum] = "992e863409d144350dbc8f0554a0f478" SRC_URI[tar.sha256sum] = "81ef261616f313372a957431d17c5a0334984f06ceea190cf390479bf043e7c4" +RDEPENDS += "kernel-module-xt-nfacct kernel-module-nfnetlink-acct" + inherit autotools pkgconfig