summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/native.bbclass1
-rw-r--r--meta/recipes-extended/cpio/cpio_2.12.bb6
-rw-r--r--meta/recipes-extended/tar/tar_1.31.bb6
3 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index e9f6c740ab..d5b6f6af8b 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -89,6 +89,7 @@ export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir} /lib /lib64
89 89
90NATIVE_PACKAGE_PATH_SUFFIX ?= "" 90NATIVE_PACKAGE_PATH_SUFFIX ?= ""
91bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 91bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
92sbindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
92base_libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 93base_libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
93libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 94libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
94libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 95libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
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"
diff --git a/meta/recipes-extended/tar/tar_1.31.bb b/meta/recipes-extended/tar/tar_1.31.bb
index a785042615..353617e95f 100644
--- a/meta/recipes-extended/tar/tar_1.31.bb
+++ b/meta/recipes-extended/tar/tar_1.31.bb
@@ -21,7 +21,7 @@ PACKAGECONFIG_append_class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl
21 21
22PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" 22PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl"
23 23
24EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" 24EXTRA_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
46PACKAGES =+ "${PN}-rmt" 46PACKAGES =+ "${PN}-rmt"
47 47
48FILES_${PN}-rmt = "${base_sbindir}/rmt*" 48FILES_${PN}-rmt = "${sbindir}/rmt*"
49 49
50inherit update-alternatives 50inherit update-alternatives
51 51
@@ -57,7 +57,7 @@ ALTERNATIVE_${PN}_class-nativesdk = ""
57ALTERNATIVE_${PN}-rmt_class-nativesdk = "" 57ALTERNATIVE_${PN}-rmt_class-nativesdk = ""
58 58
59ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" 59ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
60ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" 60ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt"
61 61
62PROVIDES_append_class-native = " tar-replacement-native" 62PROVIDES_append_class-native = " tar-replacement-native"
63NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" 63NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"