summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/cpio
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-05-05 18:04:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 12:15:17 +0100
commit6c1ddb540944f43784af929d02eb56d7efc350fb (patch)
tree53dc42ade57d422f02f6b4f2fa633c56d5b19eab /meta/recipes-extended/cpio
parent918131d4530dd05ffa274aaf798d8c74e847448d (diff)
downloadpoky-6c1ddb540944f43784af929d02eb56d7efc350fb.tar.gz
cpio/tar/native.bbclass: move rmt to sbindir and add a prefix to avoid native clashing
The rmt in cpio-native and tar-native is clashing, since tar-native has set var-NATIVE_PACKAGE_PATH_SUFFIX, we move rmt to sbindir, and add suffix NATIVE_PACKAGE_PATH_SUFFIX to sbindir could avoid the clashing. And in Ubuntu, rmt is in sbindir $ which rmt /usr/sbin/rmt (From OE-Core rev: e9ac5ac2f4d135734f549d17cce3ebc52132b7d0) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cpio')
-rw-r--r--meta/recipes-extended/cpio/cpio_2.12.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb
index cb845c3070..3713bf0b1f 100644
--- a/meta/recipes-extended/cpio/cpio_2.12.bb
+++ b/meta/recipes-extended/cpio/cpio_2.12.bb
@@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713
18 18
19inherit autotools gettext texinfo 19inherit autotools gettext texinfo
20 20
21EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" 21EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}"
22 22
23do_install () { 23do_install () {
24 autotools_do_install 24 autotools_do_install
@@ -34,7 +34,7 @@ do_install () {
34 34
35PACKAGES =+ "${PN}-rmt" 35PACKAGES =+ "${PN}-rmt"
36 36
37FILES_${PN}-rmt = "${base_sbindir}/rmt*" 37FILES_${PN}-rmt = "${sbindir}/rmt*"
38 38
39inherit update-alternatives 39inherit update-alternatives
40 40
@@ -46,6 +46,6 @@ ALTERNATIVE_${PN}-rmt = "rmt"
46ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" 46ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
47 47
48ALTERNATIVE_PRIORITY[rmt] = "50" 48ALTERNATIVE_PRIORITY[rmt] = "50"
49ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" 49ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt"
50 50
51BBCLASSEXTEND = "native" 51BBCLASSEXTEND = "native"