diff options
Diffstat (limited to 'meta/packages/parted')
-rw-r--r-- | meta/packages/parted/parted-1.9.0/no_check.patch (renamed from meta/packages/parted/parted-1.8.8/no_check.patch) | 13 | ||||
-rw-r--r-- | meta/packages/parted/parted-1.9.0/syscalls.patch (renamed from meta/packages/parted/parted-1.8.8/syscalls.patch) | 14 | ||||
-rw-r--r-- | meta/packages/parted/parted_1.9.0.bb (renamed from meta/packages/parted/parted_1.8.8.bb) | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/meta/packages/parted/parted-1.8.8/no_check.patch b/meta/packages/parted/parted-1.9.0/no_check.patch index 22d364a0a7..24a328ceea 100644 --- a/meta/packages/parted/parted-1.8.8/no_check.patch +++ b/meta/packages/parted/parted-1.9.0/no_check.patch | |||
@@ -3,15 +3,16 @@ it to be disabled. | |||
3 | 3 | ||
4 | RP - 4/11/08 | 4 | RP - 4/11/08 |
5 | 5 | ||
6 | Index: parted-1.8.8/configure.ac | 6 | Index: parted-1.9.0/configure.ac |
7 | =================================================================== | 7 | =================================================================== |
8 | --- parted-1.8.8.orig/configure.ac 2008-11-04 15:18:17.000000000 +0000 | 8 | --- parted-1.9.0.orig/configure.ac 2009-07-23 18:52:08.000000000 +0100 |
9 | +++ parted-1.8.8/configure.ac 2008-11-04 15:18:31.000000000 +0000 | 9 | +++ parted-1.9.0/configure.ac 2010-02-02 14:13:56.013905093 +0000 |
10 | @@ -481,6 +481,6 @@ | 10 | @@ -477,7 +477,7 @@ |
11 | AM_CONDITIONAL([COMPILE_FOR_S390], [test "$compile_for_s390" = "yes"]) | 11 | AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux]) |
12 | 12 | ||
13 | dnl check for "check", unit testing library/header | 13 | dnl check for "check", unit testing library/header |
14 | -PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no) | 14 | -PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no) |
15 | +have_check=no | 15 | +have_check=no |
16 | if test "$have_scintilla" != "yes"; then | 16 | if test "$have_check" != "yes"; then |
17 | AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building]) | 17 | AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building]) |
18 | fi | ||
diff --git a/meta/packages/parted/parted-1.8.8/syscalls.patch b/meta/packages/parted/parted-1.9.0/syscalls.patch index 042fc9769d..6be49968f3 100644 --- a/meta/packages/parted/parted-1.8.8/syscalls.patch +++ b/meta/packages/parted/parted-1.9.0/syscalls.patch | |||
@@ -2,20 +2,20 @@ | |||
2 | libparted/arch/linux.c | 13 +++++++++++++ | 2 | libparted/arch/linux.c | 13 +++++++++++++ |
3 | 1 file changed, 13 insertions(+) | 3 | 1 file changed, 13 insertions(+) |
4 | 4 | ||
5 | Index: parted-1.8.8/libparted/arch/linux.c | 5 | Index: parted-1.9.0/libparted/arch/linux.c |
6 | =================================================================== | 6 | =================================================================== |
7 | --- parted-1.8.8.orig/libparted/arch/linux.c 2007-08-09 20:47:57.000000000 +0200 | 7 | --- parted-1.9.0.orig/libparted/arch/linux.c 2009-07-23 18:52:08.000000000 +0100 |
8 | +++ parted-1.8.8/libparted/arch/linux.c 2008-10-06 13:49:17.000000000 +0200 | 8 | +++ parted-1.9.0/libparted/arch/linux.c 2010-02-02 14:14:16.523904768 +0000 |
9 | @@ -18,6 +18,8 @@ | 9 | @@ -17,6 +17,8 @@ |
10 | 10 | ||
11 | #define PROC_DEVICES_BUFSIZ 16384 | 11 | #define PROC_DEVICES_BUFSIZ 16384 |
12 | 12 | ||
13 | +#include <linux/version.h> | 13 | +#include <linux/version.h> |
14 | + | 14 | + |
15 | #include <config.h> | 15 | #include <config.h> |
16 | #include <arch/linux.h> | ||
16 | 17 | ||
17 | #include <parted/parted.h> | 18 | @@ -1477,12 +1479,14 @@ |
18 | @@ -1361,12 +1363,14 @@ linux_refresh_close (PedDevice* dev) | ||
19 | 19 | ||
20 | #if SIZEOF_OFF_T < 8 | 20 | #if SIZEOF_OFF_T < 8 |
21 | 21 | ||
@@ -30,7 +30,7 @@ Index: parted-1.8.8/libparted/arch/linux.c | |||
30 | 30 | ||
31 | loff_t | 31 | loff_t |
32 | llseek (unsigned int fd, loff_t offset, unsigned int whence) | 32 | llseek (unsigned int fd, loff_t offset, unsigned int whence) |
33 | @@ -1374,11 +1378,20 @@ llseek (unsigned int fd, loff_t offset, | 33 | @@ -1490,11 +1494,20 @@ |
34 | loff_t result; | 34 | loff_t result; |
35 | int retval; | 35 | int retval; |
36 | 36 | ||
diff --git a/meta/packages/parted/parted_1.8.8.bb b/meta/packages/parted/parted_1.9.0.bb index 6205460760..2a95b9ceaa 100644 --- a/meta/packages/parted/parted_1.8.8.bb +++ b/meta/packages/parted/parted_1.9.0.bb | |||
@@ -9,6 +9,6 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ | |||
9 | file://no_check.patch;patch=1 \ | 9 | file://no_check.patch;patch=1 \ |
10 | file://syscalls.patch;patch=1 " | 10 | file://syscalls.patch;patch=1 " |
11 | 11 | ||
12 | EXTRA_OECONF = "--disable-Werror" | 12 | EXTRA_OECONF = "--disable-Werror --disable-device-mapper" |
13 | 13 | ||
14 | inherit autotools_stage pkgconfig gettext | 14 | inherit autotools_stage pkgconfig gettext |