summaryrefslogtreecommitdiff
path: root/meta/packages/parted/parted-1.9.0
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-02 14:31:30 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-02 14:31:30 +0000
commitdd5269c3299fe94fa4c9cbb8c953f7f1737ee921 (patch)
treeb09ccf71948183bd422559f5eb92c344c99f19a2 /meta/packages/parted/parted-1.9.0
parent10b89e872c3b15d4e270be2233423cef7392f457 (diff)
downloadopenembedded-core-dd5269c3299fe94fa4c9cbb8c953f7f1737ee921.tar.gz
openembedded-core-dd5269c3299fe94fa4c9cbb8c953f7f1737ee921.tar.bz2
openembedded-core-dd5269c3299fe94fa4c9cbb8c953f7f1737ee921.tar.xz
openembedded-core-dd5269c3299fe94fa4c9cbb8c953f7f1737ee921.zip
parted: 1.88 -> 1.9.0 (works with recent autoconf/automake)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/parted/parted-1.9.0')
-rw-r--r--meta/packages/parted/parted-1.9.0/no_check.patch18
-rw-r--r--meta/packages/parted/parted-1.9.0/syscalls.patch53
2 files changed, 71 insertions, 0 deletions
diff --git a/meta/packages/parted/parted-1.9.0/no_check.patch b/meta/packages/parted/parted-1.9.0/no_check.patch
new file mode 100644
index 000000000..24a328cee
--- /dev/null
+++ b/meta/packages/parted/parted-1.9.0/no_check.patch
@@ -0,0 +1,18 @@
+If check is detected, it makes the builds non-determinstic so just force
+it to be disabled.
+
+RP - 4/11/08
+
+Index: parted-1.9.0/configure.ac
+===================================================================
+--- parted-1.9.0.orig/configure.ac 2009-07-23 18:52:08.000000000 +0100
++++ parted-1.9.0/configure.ac 2010-02-02 14:13:56.013905093 +0000
+@@ -477,7 +477,7 @@
+ AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux])
+
+ dnl check for "check", unit testing library/header
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
++have_check=no
+ if test "$have_check" != "yes"; then
+ AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building])
+ fi
diff --git a/meta/packages/parted/parted-1.9.0/syscalls.patch b/meta/packages/parted/parted-1.9.0/syscalls.patch
new file mode 100644
index 000000000..6be49968f
--- /dev/null
+++ b/meta/packages/parted/parted-1.9.0/syscalls.patch
@@ -0,0 +1,53 @@
+---
+ libparted/arch/linux.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+Index: parted-1.9.0/libparted/arch/linux.c
+===================================================================
+--- parted-1.9.0.orig/libparted/arch/linux.c 2009-07-23 18:52:08.000000000 +0100
++++ parted-1.9.0/libparted/arch/linux.c 2010-02-02 14:14:16.523904768 +0000
+@@ -17,6 +17,8 @@
+
+ #define PROC_DEVICES_BUFSIZ 16384
+
++#include <linux/version.h>
++
+ #include <config.h>
+ #include <arch/linux.h>
+
+@@ -1477,12 +1479,14 @@
+
+ #if SIZEOF_OFF_T < 8
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ static _syscall5(int,_llseek,
+ unsigned int, fd,
+ unsigned long, offset_high,
+ unsigned long, offset_low,
+ loff_t*, result,
+ unsigned int, origin)
++#endif
+
+ loff_t
+ llseek (unsigned int fd, loff_t offset, unsigned int whence)
+@@ -1490,11 +1494,20 @@
+ loff_t result;
+ int retval;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ retval = _llseek(fd,
+ ((unsigned long long)offset) >> 32,
+ ((unsigned long long)offset) & 0xffffffff,
+ &result,
+ whence);
++#else
++ retval = syscall(__NR__llseek, fd,
++ ((unsigned long long)offset) >> 32,
++ ((unsigned long long)offset) & 0xffffffff,
++ &result,
++ whence);
++#endif
++
+ return (retval==-1 ? (loff_t) retval : result);
+ }
+