summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <sgarman@zenlinux.com>2010-07-23 12:08:28 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-24 00:07:31 +0100
commitac5a0210322635055819da5c3f3bc0064da56f86 (patch)
treebc805450ef36137548f4fe9d8b270252c91f441a
parent80986444aaa796b45658f4d903f88d26a2379b5f (diff)
downloadpoky-ac5a0210322635055819da5c3f3bc0064da56f86.tar.gz
tar: New recipe additions 1.17 and 1.23
* tar 1.23 is GPLv3 * tar 1.17 is latest GPLv2 Recipes and patches dervied from OpenEmbedded and Debian Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rw-r--r--meta/packages/tar/tar-1.17/gcc43build.patch35
-rw-r--r--meta/packages/tar/tar-1.17/m4extensions.patch28
-rw-r--r--meta/packages/tar/tar.inc25
-rw-r--r--meta/packages/tar/tar_1.17.bb13
-rw-r--r--meta/packages/tar/tar_1.23.bb9
5 files changed, 110 insertions, 0 deletions
diff --git a/meta/packages/tar/tar-1.17/gcc43build.patch b/meta/packages/tar/tar-1.17/gcc43build.patch
new file mode 100644
index 0000000000..cc5f0e13d0
--- /dev/null
+++ b/meta/packages/tar/tar-1.17/gcc43build.patch
@@ -0,0 +1,35 @@
1# Fix errors when built with gcc 4.3
2# Patch taken from Debian bug #452096
3
4diff -urN tar-1.17.orig/lib/argp-fmtstream.h tar-1.17/lib/argp-fmtstream.h
5--- tar-1.17.orig/lib/argp-fmtstream.h 2006-01-11 12:24:05.000000000 -0800
6+++ tar-1.17/lib/argp-fmtstream.h 2010-07-22 22:36:12.000000000 -0700
7@@ -198,7 +198,11 @@
8 #endif
9
10 #ifndef ARGP_FS_EI
11-#define ARGP_FS_EI extern inline
12+ #if defined __GNUC_STDC_INLINE__
13+ #define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
14+ #else
15+ #define ARGP_FS_EI extern inline
16+ #endif
17 #endif
18
19 ARGP_FS_EI size_t
20diff -urN tar-1.17.orig/lib/argp.h tar-1.17/lib/argp.h
21--- tar-1.17.orig/lib/argp.h 2007-03-30 00:09:11.000000000 -0700
22+++ tar-1.17/lib/argp.h 2010-07-22 22:38:44.000000000 -0700
23@@ -580,7 +580,11 @@
24 # endif
25
26 # ifndef ARGP_EI
27-# define ARGP_EI extern __inline__
28+# if defined __GNUC_STDC_INLINE__
29+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
30+# else
31+# define ARGP_EI extern __inline__
32+# endif
33 # endif
34
35 ARGP_EI void
diff --git a/meta/packages/tar/tar-1.17/m4extensions.patch b/meta/packages/tar/tar-1.17/m4extensions.patch
new file mode 100644
index 0000000000..11b981aa92
--- /dev/null
+++ b/meta/packages/tar/tar-1.17/m4extensions.patch
@@ -0,0 +1,28 @@
1# Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
2# This is needed to configure correctly with newer versions of autoconf.
3
4--- tar-1.17/m4/extensions.m4.orig 2010-07-22 22:21:35.000000000 -0700
5+++ tar-1.17/m4/extensions.m4 2010-07-22 22:23:41.000000000 -0700
6@@ -1,4 +1,4 @@
7-# serial 4 -*- Autoconf -*-
8+# serial 5 -*- Autoconf -*-
9 # Enable extensions on systems that normally disable them.
10
11 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
12@@ -16,6 +16,7 @@
13 # ------------------------
14 # Enable extensions on systems that normally disable them,
15 # typically due to standards-conformance issues.
16+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
17 AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
18 [
19 AC_BEFORE([$0], [AC_COMPILE_IFELSE])
20@@ -48,7 +49,7 @@
21 AC_DEFINE([__EXTENSIONS__])
22 AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
23 AC_DEFINE([_TANDEM_SOURCE])
24-])
25+])])
26
27 # gl_USE_SYSTEM_EXTENSIONS
28 # ------------------------
diff --git a/meta/packages/tar/tar.inc b/meta/packages/tar/tar.inc
new file mode 100644
index 0000000000..cf72d4893b
--- /dev/null
+++ b/meta/packages/tar/tar.inc
@@ -0,0 +1,25 @@
1DESCRIPTION = "GNU tar saves many files together into a single tape \
2or disk archive, and can restore individual files from the archive."
3HOMEPAGE = "http://www.gnu.org/software/tar/"
4SECTION = "base"
5
6SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
7
8inherit autotools gettext
9
10do_install () {
11 autotools_do_install
12 install -d ${D}${base_bindir}
13 mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
14 mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
15}
16
17pkg_postinst_${PN} () {
18 update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
19 update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
20}
21
22pkg_prerm_${PN} () {
23 update-alternatives --remove tar tar.${PN}
24 update-alternatives --remove rmt rmt.${PN}
25}
diff --git a/meta/packages/tar/tar_1.17.bb b/meta/packages/tar/tar_1.17.bb
new file mode 100644
index 0000000000..be74542091
--- /dev/null
+++ b/meta/packages/tar/tar_1.17.bb
@@ -0,0 +1,13 @@
1require tar.inc
2
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5
6PR = "r0"
7
8SRC_URI += "file://m4extensions.patch \
9 file://gcc43build.patch \
10 "
11
12SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
13SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492"
diff --git a/meta/packages/tar/tar_1.23.bb b/meta/packages/tar/tar_1.23.bb
new file mode 100644
index 0000000000..093c0b43ce
--- /dev/null
+++ b/meta/packages/tar/tar_1.23.bb
@@ -0,0 +1,9 @@
1require tar.inc
2
3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
5
6PR = "r0"
7
8SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e"
9SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36"