diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-05-05 18:04:24 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-20 14:38:16 +0100 |
commit | 47975f07e5c7317045cfcd7a02fd2d7b766fa715 (patch) | |
tree | 4dca67b45c5f12bee115db6f876a05b6d9292b04 /meta/recipes-extended/cpio | |
parent | 025aabd28a2b6ae333fcf140684f5d33e599904f (diff) | |
download | poky-47975f07e5c7317045cfcd7a02fd2d7b766fa715.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: 9f47cea3c58a53db8599f1be4ff4401406c00928)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.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.bb | 6 |
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 | ||
19 | inherit autotools gettext texinfo | 19 | inherit autotools gettext texinfo |
20 | 20 | ||
21 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" | 21 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" |
22 | 22 | ||
23 | do_install () { | 23 | do_install () { |
24 | autotools_do_install | 24 | autotools_do_install |
@@ -34,7 +34,7 @@ do_install () { | |||
34 | 34 | ||
35 | PACKAGES =+ "${PN}-rmt" | 35 | PACKAGES =+ "${PN}-rmt" |
36 | 36 | ||
37 | FILES_${PN}-rmt = "${base_sbindir}/rmt*" | 37 | FILES_${PN}-rmt = "${sbindir}/rmt*" |
38 | 38 | ||
39 | inherit update-alternatives | 39 | inherit update-alternatives |
40 | 40 | ||
@@ -46,6 +46,6 @@ ALTERNATIVE_${PN}-rmt = "rmt" | |||
46 | ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" | 46 | ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" |
47 | 47 | ||
48 | ALTERNATIVE_PRIORITY[rmt] = "50" | 48 | ALTERNATIVE_PRIORITY[rmt] = "50" |
49 | ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" | 49 | ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" |
50 | 50 | ||
51 | BBCLASSEXTEND = "native" | 51 | BBCLASSEXTEND = "native" |