cpio: Move cpio from /usr/bin to /bin and use update-alternatives to select it in preference to the busybox cpio.

1 files changed, 5 insertions, 1 deletions

diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb
index 9762b2e764..c21a59a44a 100644
--- a/packages/cpio/cpio_2.5.bb
+++ b/packages/cpio/cpio_2.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU cpio is a program to manage archives of files."
 HOMEPAGE = "http://www.gnu.org/software/cpio/"
 SECTION = "console"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 DEPENDS += " texinfo-native "
 
@@ -14,16 +14,20 @@ inherit autotools
 
 do_install () {
 	autotools_do_install
+	install -d ${D}${base_bindir}/
+	mv ${D}${bindir}/cpio ${D}${base_bindir}/cpio.${PN}
 	mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
 }
 
 
 pkg_postinst_${PN} () {
+	update-alternatives --install ${base_bindir}/cpio cpio cpio.${PN} 100
 	update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50
 }
 
 
 pkg_prerm_${PN} () {
+	update-alternatives --remove cpio cpio.${PN}
 	update-alternatives --remove rmt rmt.${PN}
 }