summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-04-26 10:49:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:05 +0100
commitb6c35d1c5bea5c651c5261cd034f4848180c8664 (patch)
tree38ccd82157333553ff0aedaf70c59bcf9efd6f5f /meta
parentd49bfa2eaeb99b6cadf9f65053d2066b22c52e07 (diff)
downloadpoky-b6c35d1c5bea5c651c5261cd034f4848180c8664.tar.gz
tar: merge tar.inc into tar recipe
There's only one user of tar.inc (meta-gplv2 has its own copy), so merge the .inc file into the tar recipe. (From OE-Core rev: cce7b627f9046c15dde49c001481003cee33fc9c) 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/tar/tar.inc52
-rw-r--r--meta/recipes-extended/tar/tar_1.30.bb70
2 files changed, 60 insertions, 62 deletions
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
deleted file mode 100644
index 93e4da114b..0000000000
--- a/meta/recipes-extended/tar/tar.inc
+++ /dev/null
@@ -1,52 +0,0 @@
1SUMMARY = "GNU file archiving program"
2DESCRIPTION = "GNU tar saves many files together into a single tape \
3or disk archive, and can restore individual files from the archive."
4HOMEPAGE = "http://www.gnu.org/software/tar/"
5SECTION = "base"
6
7SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
8
9inherit autotools gettext texinfo
10
11EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
12
13# Let aclocal use the relative path for the m4 file rather than the
14# absolute since tar has a lot of m4 files, otherwise there might
15# be an "Argument list too long" error when it is built in a long/deep
16# directory.
17acpaths = "-I ./m4"
18
19do_install () {
20 autotools_do_install
21 ln -s tar ${D}${bindir}/gtar
22}
23
24do_install_append_class-target() {
25 if [ "${base_bindir}" != "${bindir}" ]; then
26 install -d ${D}${base_bindir}
27 mv ${D}${bindir}/tar ${D}${base_bindir}/tar
28 mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar
29 rmdir ${D}${bindir}/
30 fi
31}
32
33PACKAGES =+ "${PN}-rmt"
34
35FILES_${PN}-rmt = "${base_sbindir}/rmt*"
36
37inherit update-alternatives
38
39ALTERNATIVE_PRIORITY = "100"
40
41ALTERNATIVE_${PN} = "tar"
42ALTERNATIVE_${PN}-rmt = "rmt"
43ALTERNATIVE_${PN}_class-nativesdk = ""
44ALTERNATIVE_${PN}-rmt_class-nativesdk = ""
45
46ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
47ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
48
49PROVIDES_append_class-native = " tar-replacement-native"
50NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
51
52BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/tar/tar_1.30.bb b/meta/recipes-extended/tar/tar_1.30.bb
index e743a6d0d0..3f31622c1d 100644
--- a/meta/recipes-extended/tar/tar_1.30.bb
+++ b/meta/recipes-extended/tar/tar_1.30.bb
@@ -1,18 +1,68 @@
1require tar.inc 1SUMMARY = "GNU file archiving program"
2 2DESCRIPTION = "GNU tar saves many files together into a single tape \
3PACKAGECONFIG ??= "" 3or disk archive, and can restore individual files from the archive."
4PACKAGECONFIG[acl] = "--with-posix-acls, --without-posix-acls, acl," 4HOMEPAGE = "http://www.gnu.org/software/tar/"
5 5SECTION = "base"
6LICENSE = "GPLv3" 6LICENSE = "GPLv3"
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
8 8
9SRC_URI += "file://remove-gets.patch \ 9SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \
10 file://musl_dirent.patch \ 10 file://remove-gets.patch \
11 " 11 file://musl_dirent.patch \
12"
13
12SRC_URI[md5sum] = "8404e4c1fc5a3000228ab2b8ad674a65" 14SRC_URI[md5sum] = "8404e4c1fc5a3000228ab2b8ad674a65"
13SRC_URI[sha256sum] = "87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0beac63b7" 15SRC_URI[sha256sum] = "87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0beac63b7"
14 16
17inherit autotools gettext texinfo
18
19PACKAGECONFIG ??= ""
20PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl"
21
22EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
23
24# Let aclocal use the relative path for the m4 file rather than the
25# absolute since tar has a lot of m4 files, otherwise there might
26# be an "Argument list too long" error when it is built in a long/deep
27# directory.
28acpaths = "-I ./m4"
29
30do_install () {
31 autotools_do_install
32 ln -s tar ${D}${bindir}/gtar
33}
34
35do_install_append_class-target() {
36 if [ "${base_bindir}" != "${bindir}" ]; then
37 install -d ${D}${base_bindir}
38 mv ${D}${bindir}/tar ${D}${base_bindir}/tar
39 mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar
40 rmdir ${D}${bindir}/
41 fi
42}
43
15do_install_append_libc-musl() { 44do_install_append_libc-musl() {
16 rm -f ${D}${libdir}/charset.alias 45 rm -f ${D}${libdir}/charset.alias
17 rmdir ${D}${libdir} 46 rmdir ${D}${libdir}
18} 47}
48
49PACKAGES =+ "${PN}-rmt"
50
51FILES_${PN}-rmt = "${base_sbindir}/rmt*"
52
53inherit update-alternatives
54
55ALTERNATIVE_PRIORITY = "100"
56
57ALTERNATIVE_${PN} = "tar"
58ALTERNATIVE_${PN}-rmt = "rmt"
59ALTERNATIVE_${PN}_class-nativesdk = ""
60ALTERNATIVE_${PN}-rmt_class-nativesdk = ""
61
62ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
63ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
64
65PROVIDES_append_class-native = " tar-replacement-native"
66NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
67
68BBCLASSEXTEND = "native nativesdk"