cpio: Split RMT from cpio

After the recent change of the libexecdir definition, the update-alternatives
for the libexec rmt broke.  Fix this by moving rmt from libexec to /sbin.  Also
split the rmt app from cpio as it's likely not useful to many users.

(From OE-Core rev: 487d58a98cd9fe4b368f0e7d119f8ff7ac852781)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2012-11-15 15:26:09 -06:00 committed by Richard Purdie
parent 5283be2305
commit dbadf6b9f5
3 changed files with 11 additions and 4 deletions

View File

@ -3,7 +3,7 @@ include cpio_v2.inc
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
PR = "r3"
PR = "r4"
SRC_URI += "file://remove-gets.patch \
"

View File

@ -3,7 +3,7 @@ require cpio_v2.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b"
PR = "r2"
PR = "r3"
SRC_URI += "file://m4extensions.patch \
file://avoid_heap_overflow.patch \

View File

@ -14,6 +14,8 @@ inherit autotools gettext
S = "${WORKDIR}/cpio-${PV}"
EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
do_install () {
autotools_do_install
install -d ${D}${base_bindir}/
@ -21,13 +23,18 @@ do_install () {
rmdir ${D}${bindir}/
}
PACKAGES =+ "${PN}-rmt"
FILES_${PN}-rmt = "${base_sbindir}/rmt*"
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "cpio rmt"
ALTERNATIVE_${PN} = "cpio"
ALTERNATIVE_${PN}-rmt = "rmt"
ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
ALTERNATIVE_PRIORITY[rmt] = "50"
ALTERNATIVE_LINK_NAME[rmt] = "${libexecdir}/rmt"
ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"