diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-07-28 16:33:20 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-04 15:01:17 +0100 |
commit | deeebb52fd31c6100c140d340ca338d2b62f3ce2 (patch) | |
tree | 1b68e376f3c9dde6e2e45a6ec77def2ea290769d /meta/recipes-extended/parted/parted-2.3 | |
parent | 55be2b0f882dfa7ae1885ff0223d60606c02aad4 (diff) | |
download | openembedded-core-deeebb52fd31c6100c140d340ca338d2b62f3ce2.tar.gz openembedded-core-deeebb52fd31c6100c140d340ca338d2b62f3ce2.tar.bz2 openembedded-core-deeebb52fd31c6100c140d340ca338d2b62f3ce2.tar.xz openembedded-core-deeebb52fd31c6100c140d340ca338d2b62f3ce2.zip |
parted: Upgrade to 3.0
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-extended/parted/parted-2.3')
-rw-r--r-- | meta/recipes-extended/parted/parted-2.3/no_check.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/parted/parted-2.3/syscalls.patch | 55 |
2 files changed, 0 insertions, 75 deletions
diff --git a/meta/recipes-extended/parted/parted-2.3/no_check.patch b/meta/recipes-extended/parted/parted-2.3/no_check.patch deleted file mode 100644 index 58d8db442..000000000 --- a/meta/recipes-extended/parted/parted-2.3/no_check.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -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/recipes-extended/parted/parted-2.3/syscalls.patch b/meta/recipes-extended/parted/parted-2.3/syscalls.patch deleted file mode 100644 index e9bbe9a95..000000000 --- a/meta/recipes-extended/parted/parted-2.3/syscalls.patch +++ /dev/null @@ -1,55 +0,0 @@ -Upstream-Status: Pending - ---- - 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); - } - |