summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/parted/parted-3.1
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 /meta/recipes-extended/parted/parted-3.1
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>
Diffstat (limited to 'meta/recipes-extended/parted/parted-3.1')
-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.patch20
-rw-r--r--meta/recipes-extended/parted/parted-3.1/syscalls.patch55
4 files changed, 119 insertions, 0 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.1/no_check.patch b/meta/recipes-extended/parted/parted-3.1/no_check.patch
new file mode 100644
index 0000000000..58d8db4426
--- /dev/null
+++ b/meta/recipes-extended/parted/parted-3.1/no_check.patch
@@ -0,0 +1,20 @@
1Upstream-Status: Inappropriate [configuration]
2
3If check is detected, it makes the builds non-determinstic so just force
4it to be disabled.
5
6RP - 4/11/08
7
8Index: parted-1.9.0/configure.ac
9===================================================================
10--- parted-1.9.0.orig/configure.ac 2009-07-23 18:52:08.000000000 +0100
11+++ parted-1.9.0/configure.ac 2010-02-02 14:13:56.013905093 +0000
12@@ -477,7 +477,7 @@
13 AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux])
14
15 dnl check for "check", unit testing library/header
16-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
17+have_check=no
18 if test "$have_check" != "yes"; then
19 AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building])
20 fi
diff --git a/meta/recipes-extended/parted/parted-3.1/syscalls.patch b/meta/recipes-extended/parted/parted-3.1/syscalls.patch
new file mode 100644
index 0000000000..e9bbe9a956
--- /dev/null
+++ b/meta/recipes-extended/parted/parted-3.1/syscalls.patch
@@ -0,0 +1,55 @@
1Upstream-Status: Pending
2
3---
4 libparted/arch/linux.c | 13 +++++++++++++
5 1 file changed, 13 insertions(+)
6
7Index: parted-1.9.0/libparted/arch/linux.c
8===================================================================
9--- parted-1.9.0.orig/libparted/arch/linux.c 2009-07-23 18:52:08.000000000 +0100
10+++ parted-1.9.0/libparted/arch/linux.c 2010-02-02 14:14:16.523904768 +0000
11@@ -17,6 +17,8 @@
12
13 #define PROC_DEVICES_BUFSIZ 16384
14
15+#include <linux/version.h>
16+
17 #include <config.h>
18 #include <arch/linux.h>
19
20@@ -1477,12 +1479,14 @@
21
22 #if SIZEOF_OFF_T < 8
23
24+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
25 static _syscall5(int,_llseek,
26 unsigned int, fd,
27 unsigned long, offset_high,
28 unsigned long, offset_low,
29 loff_t*, result,
30 unsigned int, origin)
31+#endif
32
33 loff_t
34 llseek (unsigned int fd, loff_t offset, unsigned int whence)
35@@ -1490,11 +1494,20 @@
36 loff_t result;
37 int retval;
38
39+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
40 retval = _llseek(fd,
41 ((unsigned long long)offset) >> 32,
42 ((unsigned long long)offset) & 0xffffffff,
43 &result,
44 whence);
45+#else
46+ retval = syscall(__NR__llseek, fd,
47+ ((unsigned long long)offset) >> 32,
48+ ((unsigned long long)offset) & 0xffffffff,
49+ &result,
50+ whence);
51+#endif
52+
53 return (retval==-1 ? (loff_t) retval : result);
54 }
55