From dd5269c3299fe94fa4c9cbb8c953f7f1737ee921 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Feb 2010 14:31:30 +0000 Subject: parted: 1.88 -> 1.9.0 (works with recent autoconf/automake) Signed-off-by: Richard Purdie --- meta/packages/parted/parted-1.8.8/no_check.patch | 17 -------- meta/packages/parted/parted-1.8.8/syscalls.patch | 53 ------------------------ meta/packages/parted/parted-1.9.0/no_check.patch | 18 ++++++++ meta/packages/parted/parted-1.9.0/syscalls.patch | 53 ++++++++++++++++++++++++ meta/packages/parted/parted_1.8.8.bb | 14 ------- meta/packages/parted/parted_1.9.0.bb | 14 +++++++ 6 files changed, 85 insertions(+), 84 deletions(-) delete mode 100644 meta/packages/parted/parted-1.8.8/no_check.patch delete mode 100644 meta/packages/parted/parted-1.8.8/syscalls.patch create mode 100644 meta/packages/parted/parted-1.9.0/no_check.patch create mode 100644 meta/packages/parted/parted-1.9.0/syscalls.patch delete mode 100644 meta/packages/parted/parted_1.8.8.bb create mode 100644 meta/packages/parted/parted_1.9.0.bb 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 -+ - #include - - #include -@@ -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); - } - 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 ++ + #include + #include + +@@ -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); + } + diff --git a/meta/packages/parted/parted_1.8.8.bb b/meta/packages/parted/parted_1.8.8.bb deleted file mode 100644 index 620546076..000000000 --- a/meta/packages/parted/parted_1.8.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "parted, the GNU partition resizing program" -HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" -LICENSE = "GPLv2" -SECTION = "console/tools" -DEPENDS = "readline e2fsprogs" -PR = "r3" - -SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ - file://no_check.patch;patch=1 \ - file://syscalls.patch;patch=1 " - -EXTRA_OECONF = "--disable-Werror" - -inherit autotools_stage pkgconfig gettext diff --git a/meta/packages/parted/parted_1.9.0.bb b/meta/packages/parted/parted_1.9.0.bb new file mode 100644 index 000000000..2a95b9cea --- /dev/null +++ b/meta/packages/parted/parted_1.9.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv2" +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs" +PR = "r3" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ + file://no_check.patch;patch=1 \ + file://syscalls.patch;patch=1 " + +EXTRA_OECONF = "--disable-Werror --disable-device-mapper" + +inherit autotools_stage pkgconfig gettext -- cgit v1.2.3