From 8621b51850332e5a7f3a05431e1f1c2aab6d6787 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Fri, 19 Jun 2015 09:44:42 -0700 Subject: drbd ufw linux-atm: correct certain packaging error The named packages explicitly install some items under /lib, but the recipes assume they are in base_libdir. We change the recipes. Signed-off-by: Joe Slater Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-connectivity/ufw/ufw_0.33.bb | 4 +++- meta-networking/recipes-support/drbd/drbd_8.4.4.bb | 6 ++++-- meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'meta-networking') diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb index 2721f8fa73..66e917e315 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb +++ b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb @@ -32,10 +32,12 @@ RRECOMMENDS_${PN} = " \ kernel-module-ipv6 \ " +# Certain items are explicitly put under /lib, not base_libdir when installed. +# FILES_${PN} += " \ ${sbindir}/* \ ${datadir}/ufw/* \ - ${base_libdir}/ufw/* \ + /lib/ufw/* \ ${sysconfdir}/ufw/* \ ${sysconfdir}/default/ufw \ " diff --git a/meta-networking/recipes-support/drbd/drbd_8.4.4.bb b/meta-networking/recipes-support/drbd/drbd_8.4.4.bb index 5baffc623d..7458707ada 100644 --- a/meta-networking/recipes-support/drbd/drbd_8.4.4.bb +++ b/meta-networking/recipes-support/drbd/drbd_8.4.4.bb @@ -46,6 +46,8 @@ do_install_append() { RDEPENDS_${PN} += "bash perl" +# The drbd items are explicitly put under /lib when installed. +# FILES_${PN} += "/run" -FILES_${PN} += "${base_libdir}/drbd" -FILES_${PN}-dbg += "${base_libdir}/drbd/.debug" +FILES_${PN} += "/lib/drbd" +FILES_${PN}-dbg += "/lib/drbd/.debug" diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 0a9bd8c72b..d0c0cecc3c 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -19,4 +19,7 @@ file://COPYING.LGPL;md5=6e29c688d912da12b66b73e32b03d812" inherit autotools pkgconfig -FILES_${PN} += "${base_libdir}/firmware" +# The firmware is explicitly put under /lib when installed. +# + +FILES_${PN} += "/lib/firmware" -- cgit 1.2.3-korg