summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/cpio/cpio_2.11.bb2
-rw-r--r--meta/recipes-extended/cpio/cpio_2.8.bb2
-rw-r--r--meta/recipes-extended/cpio/cpio_v2.inc29
3 files changed, 12 insertions, 21 deletions
diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb
index 78da20e3d4..73a3444b57 100644
--- a/meta/recipes-extended/cpio/cpio_2.11.bb
+++ b/meta/recipes-extended/cpio/cpio_2.11.bb
@@ -3,7 +3,7 @@ include cpio_v2.inc
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" 4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
5 5
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" 8SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"
9SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978" 9SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978"
diff --git a/meta/recipes-extended/cpio/cpio_2.8.bb b/meta/recipes-extended/cpio/cpio_2.8.bb
index 006e4f6dfb..cabc1cd605 100644
--- a/meta/recipes-extended/cpio/cpio_2.8.bb
+++ b/meta/recipes-extended/cpio/cpio_2.8.bb
@@ -3,7 +3,7 @@ require cpio_v2.inc
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b" 4LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b"
5 5
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI += "file://m4extensions.patch \ 8SRC_URI += "file://m4extensions.patch \
9 file://avoid_heap_overflow.patch \ 9 file://avoid_heap_overflow.patch \
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
index 066e9374a2..3b3402b536 100644
--- a/meta/recipes-extended/cpio/cpio_v2.inc
+++ b/meta/recipes-extended/cpio/cpio_v2.inc
@@ -17,26 +17,17 @@ S = "${WORKDIR}/cpio-${PV}"
17do_install () { 17do_install () {
18 autotools_do_install 18 autotools_do_install
19 install -d ${D}${base_bindir}/ 19 install -d ${D}${base_bindir}/
20 mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio.${PN}" 20 mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio"
21 rmdir ${D}${bindir}/ 21 rmdir ${D}${bindir}/
22 case ${TARGET_OS} in
23 *-uclibc*) ;;
24 *) mv "${D}${libexecdir}/rmt" "${D}${libexecdir}/rmt.${PN}" ;;
25 esac
26} 22}
27 23
28pkg_postinst_${PN} () { 24inherit update-alternatives
29 update-alternatives --install ${base_bindir}/cpio cpio cpio.${PN} 100
30 if [ -f ${libexecdir}/rmt.${PN} ]
31 then
32 update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 50
33 fi
34}
35 25
36pkg_prerm_${PN} () { 26ALTERNATIVE_PRIORITY = "100"
37 update-alternatives --remove cpio cpio.${PN} 27
38 if [ -f ${libexecdir}/rmt.${PN} ] 28ALTERNATIVE_${PN} = "cpio rmt"
39 then 29
40 update-alternatives --remove rmt rmt.${PN} 30ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
41 fi 31
42} 32ALTERNATIVE_PRIORITY[rmt] = "50"
33ALTERNATIVE_LINK_NAME[rmt] = "${libexecdir}/rmt"