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-08 12:15:17 +0100 |
commit | 6c1ddb540944f43784af929d02eb56d7efc350fb (patch) | |
tree | 53dc42ade57d422f02f6b4f2fa633c56d5b19eab /meta/recipes-extended/tar/tar_1.32.bb | |
parent | 918131d4530dd05ffa274aaf798d8c74e847448d (diff) | |
download | poky-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/tar/tar_1.32.bb')
-rw-r--r-- | meta/recipes-extended/tar/tar_1.32.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb index d14aeb8061..7240fdb7e1 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.32.bb | |||
@@ -21,7 +21,7 @@ PACKAGECONFIG_append_class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl | |||
21 | 21 | ||
22 | PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" | 22 | PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" |
23 | 23 | ||
24 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" | 24 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" |
25 | 25 | ||
26 | # Let aclocal use the relative path for the m4 file rather than the | 26 | # Let aclocal use the relative path for the m4 file rather than the |
27 | # absolute since tar has a lot of m4 files, otherwise there might | 27 | # absolute since tar has a lot of m4 files, otherwise there might |
@@ -45,7 +45,7 @@ do_install_append_class-target() { | |||
45 | 45 | ||
46 | PACKAGES =+ "${PN}-rmt" | 46 | PACKAGES =+ "${PN}-rmt" |
47 | 47 | ||
48 | FILES_${PN}-rmt = "${base_sbindir}/rmt*" | 48 | FILES_${PN}-rmt = "${sbindir}/rmt*" |
49 | 49 | ||
50 | inherit update-alternatives | 50 | inherit update-alternatives |
51 | 51 | ||
@@ -57,7 +57,7 @@ ALTERNATIVE_${PN}_class-nativesdk = "" | |||
57 | ALTERNATIVE_${PN}-rmt_class-nativesdk = "" | 57 | ALTERNATIVE_${PN}-rmt_class-nativesdk = "" |
58 | 58 | ||
59 | ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" | 59 | ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" |
60 | ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" | 60 | ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" |
61 | 61 | ||
62 | PROVIDES_append_class-native = " tar-replacement-native" | 62 | PROVIDES_append_class-native = " tar-replacement-native" |
63 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | 63 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" |