diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-02 14:31:30 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-02 14:31:30 +0000 |
commit | dd5269c3299fe94fa4c9cbb8c953f7f1737ee921 (patch) | |
tree | b09ccf71948183bd422559f5eb92c344c99f19a2 /meta/packages/parted/parted-1.8.8 | |
parent | 10b89e872c3b15d4e270be2233423cef7392f457 (diff) | |
download | openembedded-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.8.8')
-rw-r--r-- | meta/packages/parted/parted-1.8.8/no_check.patch | 17 | ||||
-rw-r--r-- | meta/packages/parted/parted-1.8.8/syscalls.patch | 53 |
2 files changed, 0 insertions, 70 deletions
diff --git a/meta/packages/parted/parted-1.8.8/no_check.patch b/meta/packages/parted/parted-1.8.8/no_check.patch deleted file mode 100644 index 22d364a0a..000000000 --- a/meta/packages/parted/parted-1.8.8/no_check.patch +++ /dev/null @@ -1,17 +0,0 @@ -If check is detected, it makes the builds non-determinstic so just force -it to be disabled. - -RP - 4/11/08 - -Index: parted-1.8.8/configure.ac -=================================================================== ---- parted-1.8.8.orig/configure.ac 2008-11-04 15:18:17.000000000 +0000 -+++ parted-1.8.8/configure.ac 2008-11-04 15:18:31.000000000 +0000 -@@ -481,6 +481,6 @@ - AM_CONDITIONAL([COMPILE_FOR_S390], [test "$compile_for_s390" = "yes"]) - - 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_scintilla" != "yes"; then - AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building]) diff --git a/meta/packages/parted/parted-1.8.8/syscalls.patch b/meta/packages/parted/parted-1.8.8/syscalls.patch deleted file mode 100644 index 042fc9769..000000000 --- a/meta/packages/parted/parted-1.8.8/syscalls.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- - libparted/arch/linux.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -Index: parted-1.8.8/libparted/arch/linux.c -=================================================================== ---- parted-1.8.8.orig/libparted/arch/linux.c 2007-08-09 20:47:57.000000000 +0200 -+++ parted-1.8.8/libparted/arch/linux.c 2008-10-06 13:49:17.000000000 +0200 -@@ -18,6 +18,8 @@ - - #define PROC_DEVICES_BUFSIZ 16384 - -+#include <linux/version.h> -+ - #include <config.h> - - #include <parted/parted.h> -@@ -1361,12 +1363,14 @@ linux_refresh_close (PedDevice* dev) - - #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) -@@ -1374,11 +1378,20 @@ llseek (unsigned int fd, loff_t offset, - 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); - } - |