diff options
author | Joe Slater <jslater@windriver.com> | 2015-06-19 09:44:42 -0700 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-07-06 15:27:52 -0400 |
commit | 8621b51850332e5a7f3a05431e1f1c2aab6d6787 (patch) | |
tree | 79c42574d71f5dcf5caeaa9b7bf37c701879fcf6 /meta-networking | |
parent | 51e4d5dc4a905082526717ebe138f43731d93d53 (diff) | |
download | meta-openembedded-8621b51850332e5a7f3a05431e1f1c2aab6d6787.tar.gz |
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@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/ufw/ufw_0.33.bb | 4 | ||||
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd_8.4.4.bb | 6 | ||||
-rw-r--r-- | 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 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} = " \ | |||
32 | kernel-module-ipv6 \ | 32 | kernel-module-ipv6 \ |
33 | " | 33 | " |
34 | 34 | ||
35 | # Certain items are explicitly put under /lib, not base_libdir when installed. | ||
36 | # | ||
35 | FILES_${PN} += " \ | 37 | FILES_${PN} += " \ |
36 | ${sbindir}/* \ | 38 | ${sbindir}/* \ |
37 | ${datadir}/ufw/* \ | 39 | ${datadir}/ufw/* \ |
38 | ${base_libdir}/ufw/* \ | 40 | /lib/ufw/* \ |
39 | ${sysconfdir}/ufw/* \ | 41 | ${sysconfdir}/ufw/* \ |
40 | ${sysconfdir}/default/ufw \ | 42 | ${sysconfdir}/default/ufw \ |
41 | " | 43 | " |
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() { | |||
46 | 46 | ||
47 | RDEPENDS_${PN} += "bash perl" | 47 | RDEPENDS_${PN} += "bash perl" |
48 | 48 | ||
49 | # The drbd items are explicitly put under /lib when installed. | ||
50 | # | ||
49 | FILES_${PN} += "/run" | 51 | FILES_${PN} += "/run" |
50 | FILES_${PN} += "${base_libdir}/drbd" | 52 | FILES_${PN} += "/lib/drbd" |
51 | FILES_${PN}-dbg += "${base_libdir}/drbd/.debug" | 53 | 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" | |||
19 | 19 | ||
20 | inherit autotools pkgconfig | 20 | inherit autotools pkgconfig |
21 | 21 | ||
22 | FILES_${PN} += "${base_libdir}/firmware" | 22 | # The firmware is explicitly put under /lib when installed. |
23 | # | ||
24 | |||
25 | FILES_${PN} += "/lib/firmware" | ||