diff options
Diffstat (limited to 'meta/recipes-extended/parted/parted-3.0')
-rw-r--r-- | meta/recipes-extended/parted/parted-3.0/no_check.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/parted/parted-3.0/syscalls.patch | 55 |
2 files changed, 75 insertions, 0 deletions
diff --git a/meta/recipes-extended/parted/parted-3.0/no_check.patch b/meta/recipes-extended/parted/parted-3.0/no_check.patch new file mode 100644 index 0000000000..58d8db4426 --- /dev/null +++ b/meta/recipes-extended/parted/parted-3.0/no_check.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | If check is detected, it makes the builds non-determinstic so just force | ||
4 | it to be disabled. | ||
5 | |||
6 | RP - 4/11/08 | ||
7 | |||
8 | Index: 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.0/syscalls.patch b/meta/recipes-extended/parted/parted-3.0/syscalls.patch new file mode 100644 index 0000000000..e9bbe9a956 --- /dev/null +++ b/meta/recipes-extended/parted/parted-3.0/syscalls.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- | ||
4 | libparted/arch/linux.c | 13 +++++++++++++ | ||
5 | 1 file changed, 13 insertions(+) | ||
6 | |||
7 | Index: 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 | |||