summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-11-15 15:26:09 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:02 +0000
commitdbadf6b9f5bae1e513b0f1957b8a4c9687d5ea80 (patch)
treee273f5f7acb4b920fdd6b40cf5e36025b77b03f7
parent5283be2305b157b3fbc61b5f2cce0c65100c9b4a (diff)
downloadpoky-dbadf6b9f5bae1e513b0f1957b8a4c9687d5ea80.tar.gz
cpio: Split RMT from cpio
After the recent change of the libexecdir definition, the update-alternatives for the libexec rmt broke. Fix this by moving rmt from libexec to /sbin. Also split the rmt app from cpio as it's likely not useful to many users. (From OE-Core rev: 487d58a98cd9fe4b368f0e7d119f8ff7ac852781) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cpio/cpio_2.11.bb2
-rw-r--r--meta/recipes-extended/cpio/cpio_2.8.bb2
-rw-r--r--meta/recipes-extended/cpio/cpio_v2.inc11
3 files changed, 11 insertions, 4 deletions
diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb
index 9b37dcdeba..5f88b30f1e 100644
--- a/meta/recipes-extended/cpio/cpio_2.11.bb
+++ b/meta/recipes-extended/cpio/cpio_2.11.bb
@@ -3,7 +3,7 @@ include cpio_v2.inc
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" 4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
5 5
6PR = "r3" 6PR = "r4"
7 7
8SRC_URI += "file://remove-gets.patch \ 8SRC_URI += "file://remove-gets.patch \
9 " 9 "
diff --git a/meta/recipes-extended/cpio/cpio_2.8.bb b/meta/recipes-extended/cpio/cpio_2.8.bb
index cabc1cd605..b6da207b92 100644
--- a/meta/recipes-extended/cpio/cpio_2.8.bb
+++ b/meta/recipes-extended/cpio/cpio_2.8.bb
@@ -3,7 +3,7 @@ require cpio_v2.inc
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b" 4LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b"
5 5
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI += "file://m4extensions.patch \ 8SRC_URI += "file://m4extensions.patch \
9 file://avoid_heap_overflow.patch \ 9 file://avoid_heap_overflow.patch \
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
index 3b3402b536..30446b0ced 100644
--- a/meta/recipes-extended/cpio/cpio_v2.inc
+++ b/meta/recipes-extended/cpio/cpio_v2.inc
@@ -14,6 +14,8 @@ inherit autotools gettext
14 14
15S = "${WORKDIR}/cpio-${PV}" 15S = "${WORKDIR}/cpio-${PV}"
16 16
17EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
18
17do_install () { 19do_install () {
18 autotools_do_install 20 autotools_do_install
19 install -d ${D}${base_bindir}/ 21 install -d ${D}${base_bindir}/
@@ -21,13 +23,18 @@ do_install () {
21 rmdir ${D}${bindir}/ 23 rmdir ${D}${bindir}/
22} 24}
23 25
26PACKAGES =+ "${PN}-rmt"
27
28FILES_${PN}-rmt = "${base_sbindir}/rmt*"
29
24inherit update-alternatives 30inherit update-alternatives
25 31
26ALTERNATIVE_PRIORITY = "100" 32ALTERNATIVE_PRIORITY = "100"
27 33
28ALTERNATIVE_${PN} = "cpio rmt" 34ALTERNATIVE_${PN} = "cpio"
35ALTERNATIVE_${PN}-rmt = "rmt"
29 36
30ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" 37ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
31 38
32ALTERNATIVE_PRIORITY[rmt] = "50" 39ALTERNATIVE_PRIORITY[rmt] = "50"
33ALTERNATIVE_LINK_NAME[rmt] = "${libexecdir}/rmt" 40ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"