summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-15 23:17:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 15:33:03 +0000
commitd4129c186c21f6a21c0eafcbc3f4f70d26723366 (patch)
tree2f3c752365656db61be49673f5cc8cdd1e6f41de
parent86ff2d7196d5c7e0ea54be7475ab03b3f670dbc3 (diff)
downloadpoky-d4129c186c21f6a21c0eafcbc3f4f70d26723366.tar.gz
parted: update to version 3.1
* Supports disks > 2TB (From OE-Core rev: 27dd817838647d43769b400e7829730f7180a79a) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch20
-rw-r--r--meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch24
-rw-r--r--meta/recipes-extended/parted/parted-3.1/no_check.patch (renamed from meta/recipes-extended/parted/parted-3.0/no_check.patch)0
-rw-r--r--meta/recipes-extended/parted/parted-3.1/syscalls.patch (renamed from meta/recipes-extended/parted/parted-3.0/syscalls.patch)0
-rw-r--r--meta/recipes-extended/parted/parted_3.1.bb (renamed from meta/recipes-extended/parted/parted_3.0.bb)10
5 files changed, 50 insertions, 4 deletions
diff --git a/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch b/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch
new file mode 100644
index 0000000000..0711d4e297
--- /dev/null
+++ b/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch
@@ -0,0 +1,20 @@
1Upstream-Status: Submitted [bug-parted@gnu.org]
2
3| for po in `ls -1 ./*.pt_BR.po 2>/dev/null`; do \
4| make $(basename ${po%.pt_BR.po}); \
5| done
6| Makefile:904: *** Recursive variable `mandir' references itself (eventually). Stop.
7
8Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
9
10--- parted-3.1/doc/po4a.mk.orig 2012-03-15 14:09:11.555831872 +0100
11+++ parted-3.1/doc/po4a.mk 2012-03-15 14:10:44.243830985 +0100
12@@ -23,7 +23,7 @@
13 # threshold is 80%), it won't be distributed, and the build won't fail.
14 #
15
16-mandir = $(mandir)/$(lang)
17+mandir := $(mandir)/$(lang)
18
19 # Inform automake that we want to install some man pages in section 1, 5
20 # and 8.
diff --git a/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch b/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch
new file mode 100644
index 0000000000..3110a724f8
--- /dev/null
+++ b/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch
@@ -0,0 +1,24 @@
1Upstream-Status: Submitted [bug-parted@gnu.org]
2
3Initialize (version-)prefix to prevent inheritance from
4the build environment during autoreconf.
5
6| sed: -e expression #1, char 9: unknown option to `s'
7| configure.ac:55: error: AC_INIT should be called with package and version arguments
8| aclocal.m4:594: AM_INIT_AUTOMAKE is expanded from...
9| configure.ac:55: the top level
10| autom4te: /usr/bin/m4 failed with exit status: 1
11
12Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
13
14--- parted-3.1/build-aux/git-version-gen.orig 2012-03-15 13:51:38.911841912 +0100
15+++ parted-3.1/build-aux/git-version-gen 2012-03-15 13:51:50.171841800 +0100
16@@ -92,6 +92,8 @@
17
18 Running without arguments will suffice in most cases."
19
20+prefix="v"
21+
22 while test $# -gt 0; do
23 case $1 in
24 --help) echo "$usage"; exit 0;;
diff --git a/meta/recipes-extended/parted/parted-3.0/no_check.patch b/meta/recipes-extended/parted/parted-3.1/no_check.patch
index 58d8db4426..58d8db4426 100644
--- a/meta/recipes-extended/parted/parted-3.0/no_check.patch
+++ b/meta/recipes-extended/parted/parted-3.1/no_check.patch
diff --git a/meta/recipes-extended/parted/parted-3.0/syscalls.patch b/meta/recipes-extended/parted/parted-3.1/syscalls.patch
index e9bbe9a956..e9bbe9a956 100644
--- a/meta/recipes-extended/parted/parted-3.0/syscalls.patch
+++ b/meta/recipes-extended/parted/parted-3.1/syscalls.patch
diff --git a/meta/recipes-extended/parted/parted_3.0.bb b/meta/recipes-extended/parted/parted_3.1.bb
index 2fba6d1446..267e53b4f1 100644
--- a/meta/recipes-extended/parted/parted_3.0.bb
+++ b/meta/recipes-extended/parted/parted_3.1.bb
@@ -6,12 +6,14 @@ SECTION = "console/tools"
6DEPENDS = "readline e2fsprogs" 6DEPENDS = "readline e2fsprogs"
7PR = "r0" 7PR = "r0"
8 8
9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ 9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://no_check.patch \ 10 file://no_check.patch \
11 file://syscalls.patch " 11 file://syscalls.patch \
12 file://fix-git-version-gen.patch \
13 file://fix-doc-mandir.patch"
12 14
13SRC_URI[md5sum] = "a94e84a9b9944715c4453f82ccc639bf" 15SRC_URI[md5sum] = "5d89d64d94bcfefa9ce8f59f4b81bdcb"
14SRC_URI[sha256sum] = "8886eece015202f6bd5ce8414f4b68838452cef509f2e3389ad56128219837b7" 16SRC_URI[sha256sum] = "5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15"
15 17
16EXTRA_OECONF = "--disable-device-mapper" 18EXTRA_OECONF = "--disable-device-mapper"
17 19