[oe-commits] Joe Slater : drbd ufw linux-atm: correct certain packaging error
git at git.openembedded.org
git at git.openembedded.org
Fri Jun 19 16:56:36 UTC 2015
Module: meta-openembedded.git
Branch: master-next
Commit: 4ef54a6d028683c53f15d3f4fd5691269bcf088e
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=4ef54a6d028683c53f15d3f4fd5691269bcf088e
Author: Joe Slater <jslater at windriver.com>
Date: Fri Jun 19 09:44:42 2015 -0700
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 <jslater at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
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(-)
diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
index 2721f8f..66e917e 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 5baffc6..7458707 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 0a9bd8c..d0c0cec 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"
More information about the Openembedded-commits
mailing list