summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/cpio/cpio_2.13.bb
diff options
context:
space:
mode:
authorhongxu <hongxu.jia@windriver.com>2020-07-01 22:51:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-03 11:38:24 +0100
commitc9c9913cf6bcadca941126c558f5a0790415b389 (patch)
treee73fa887c5725478226c61fec6ad7b6935ea2e53 /meta/recipes-extended/cpio/cpio_2.13.bb
parentebfa049fc0570ec3f8859295f75d20b66b24f43f (diff)
downloadpoky-c9c9913cf6bcadca941126c558f5a0790415b389.tar.gz
cpio: add nativesdk support
Since commit [24b80d211f nativesdk.bbclass: set sbindir to bindir] applied, sbindir = bindir in nativesdk, then routine `rmt' is installed to bindir which break `rmdir ${D}${bindir}/' failed with `Directory not empty' Don't rmdir if sbindir != bindir (From OE-Core rev: 6cf92e4d80e6dc85853392865a2ba6eca8bbfdb0) 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/cpio_2.13.bb')
-rw-r--r--meta/recipes-extended/cpio/cpio_2.13.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb
index 9e35a80f8b..94d86100c7 100644
--- a/meta/recipes-extended/cpio/cpio_2.13.bb
+++ b/meta/recipes-extended/cpio/cpio_2.13.bb
@@ -23,7 +23,9 @@ do_install () {
23 if [ "${base_bindir}" != "${bindir}" ]; then 23 if [ "${base_bindir}" != "${bindir}" ]; then
24 install -d ${D}${base_bindir}/ 24 install -d ${D}${base_bindir}/
25 mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio" 25 mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio"
26 rmdir ${D}${bindir}/ 26 if [ "${sbindir}" != "${bindir}" ]; then
27 rmdir ${D}${bindir}/
28 fi
27 fi 29 fi
28 30
29 # Avoid conflicts with the version from tar 31 # Avoid conflicts with the version from tar
@@ -46,4 +48,4 @@ ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
46ALTERNATIVE_PRIORITY[rmt] = "50" 48ALTERNATIVE_PRIORITY[rmt] = "50"
47ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" 49ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt"
48 50
49BBCLASSEXTEND = "native" 51BBCLASSEXTEND = "native nativesdk"