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>
This commit is contained in:
hongxu
2020-07-01 22:51:30 +08:00
committed by Richard Purdie
parent ebfa049fc0
commit c9c9913cf6

View File

@@ -23,7 +23,9 @@ do_install () {
if [ "${base_bindir}" != "${bindir}" ]; then
install -d ${D}${base_bindir}/
mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio"
rmdir ${D}${bindir}/
if [ "${sbindir}" != "${bindir}" ]; then
rmdir ${D}${bindir}/
fi
fi
# Avoid conflicts with the version from tar
@@ -46,4 +48,4 @@ ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
ALTERNATIVE_PRIORITY[rmt] = "50"
ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt"
BBCLASSEXTEND = "native"
BBCLASSEXTEND = "native nativesdk"