summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-24 17:14:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 17:56:24 +0100
commitb177ee9244e1978bcfcaab799e83fcb7d5e6242c (patch)
tree54550b922fde19bfeae4e96c9343a59cd1af9fdb /meta
parentd7c5ae6ea9362e2c5449c91e590fc388456b0115 (diff)
downloadpoky-b177ee9244e1978bcfcaab799e83fcb7d5e6242c.tar.gz
cpio: move contents of cpio_v2.inc into the cpio recipe
Merge contents of cpio_v2.inc into the only recipe which uses it. (From OE-Core rev: 162ff3871779d646dadc7e7287f4667641d6e612) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/cpio/cpio_2.12.bb40
-rw-r--r--meta/recipes-extended/cpio/cpio_v2.inc43
2 files changed, 38 insertions, 45 deletions
diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb
index 405a90e03a..0b83e9b07d 100644
--- a/meta/recipes-extended/cpio/cpio_2.12.bb
+++ b/meta/recipes-extended/cpio/cpio_2.12.bb
@@ -1,8 +1,13 @@
1require cpio_v2.inc 1SUMMARY = "GNU cpio is a program to manage archives of files"
2 2DESCRIPTION = "GNU cpio is a tool for creating and extracting archives, or copying files from one place to \
3another. It handles a number of cpio formats as well as reading and writing tar files."
4HOMEPAGE = "http://www.gnu.org/software/cpio/"
5SECTION = "base"
3LICENSE = "GPLv3" 6LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" 7LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
5 8
9DEPENDS = "texinfo-native"
10
6SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
7 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 12 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
8 file://0001-Fix-CVE-2015-1197.patch \ 13 file://0001-Fix-CVE-2015-1197.patch \
@@ -10,3 +15,34 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
10 15
11SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86" 16SRC_URI[md5sum] = "fc207561a86b63862eea4b8300313e86"
12SRC_URI[sha256sum] = "08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73" 17SRC_URI[sha256sum] = "08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73"
18
19inherit autotools gettext texinfo
20
21EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
22
23do_install () {
24 autotools_do_install
25 if [ "${base_bindir}" != "${bindir}" ]; then
26 install -d ${D}${base_bindir}/
27 mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio"
28 rmdir ${D}${bindir}/
29 fi
30}
31
32PACKAGES =+ "${PN}-rmt"
33
34FILES_${PN}-rmt = "${base_sbindir}/rmt*"
35
36inherit update-alternatives
37
38ALTERNATIVE_PRIORITY = "100"
39
40ALTERNATIVE_${PN} = "cpio"
41ALTERNATIVE_${PN}-rmt = "rmt"
42
43ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
44
45ALTERNATIVE_PRIORITY[rmt] = "50"
46ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
47
48BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
deleted file mode 100644
index 31adb717d4..0000000000
--- a/meta/recipes-extended/cpio/cpio_v2.inc
+++ /dev/null
@@ -1,43 +0,0 @@
1SUMMARY = "GNU cpio is a program to manage archives of files"
2DESCRIPTION = "GNU cpio is a tool for creating and extracting archives, or copying files from one place to \
3another. It handles a number of cpio formats as well as reading and writing tar files."
4HOMEPAGE = "http://www.gnu.org/software/cpio/"
5SECTION = "base"
6
7DEPENDS = "texinfo-native"
8
9SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
10 "
11
12inherit autotools gettext texinfo
13
14S = "${WORKDIR}/cpio-${PV}"
15
16EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
17
18do_install () {
19 autotools_do_install
20 if [ "${base_bindir}" != "${bindir}" ]; then
21 install -d ${D}${base_bindir}/
22 mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio"
23 rmdir ${D}${bindir}/
24 fi
25}
26
27PACKAGES =+ "${PN}-rmt"
28
29FILES_${PN}-rmt = "${base_sbindir}/rmt*"
30
31inherit update-alternatives
32
33ALTERNATIVE_PRIORITY = "100"
34
35ALTERNATIVE_${PN} = "cpio"
36ALTERNATIVE_${PN}-rmt = "rmt"
37
38ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio"
39
40ALTERNATIVE_PRIORITY[rmt] = "50"
41ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
42
43BBCLASSEXTEND = "native"