From d4129c186c21f6a21c0eafcbc3f4f70d26723366 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 15 Mar 2012 23:17:52 +0100 Subject: parted: update to version 3.1 * Supports disks > 2TB (From OE-Core rev: 27dd817838647d43769b400e7829730f7180a79a) Signed-off-by: Andreas Oberritter Signed-off-by: Richard Purdie --- .../parted/parted-3.0/no_check.patch | 20 -------- .../parted/parted-3.0/syscalls.patch | 55 ---------------------- .../parted/parted-3.1/fix-doc-mandir.patch | 20 ++++++++ .../parted/parted-3.1/fix-git-version-gen.patch | 24 ++++++++++ .../parted/parted-3.1/no_check.patch | 20 ++++++++ .../parted/parted-3.1/syscalls.patch | 55 ++++++++++++++++++++++ meta/recipes-extended/parted/parted_3.0.bb | 20 -------- meta/recipes-extended/parted/parted_3.1.bb | 22 +++++++++ 8 files changed, 141 insertions(+), 95 deletions(-) delete mode 100644 meta/recipes-extended/parted/parted-3.0/no_check.patch delete mode 100644 meta/recipes-extended/parted/parted-3.0/syscalls.patch create mode 100644 meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch create mode 100644 meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch create mode 100644 meta/recipes-extended/parted/parted-3.1/no_check.patch create mode 100644 meta/recipes-extended/parted/parted-3.1/syscalls.patch delete mode 100644 meta/recipes-extended/parted/parted_3.0.bb create mode 100644 meta/recipes-extended/parted/parted_3.1.bb (limited to 'meta') diff --git a/meta/recipes-extended/parted/parted-3.0/no_check.patch b/meta/recipes-extended/parted/parted-3.0/no_check.patch deleted file mode 100644 index 58d8db4426..0000000000 --- a/meta/recipes-extended/parted/parted-3.0/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-3.0/syscalls.patch b/meta/recipes-extended/parted/parted-3.0/syscalls.patch deleted file mode 100644 index e9bbe9a956..0000000000 --- a/meta/recipes-extended/parted/parted-3.0/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 -+ - #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/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch b/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch new file mode 100644 index 0000000000..0711d4e297 --- /dev/null +++ b/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch @@ -0,0 +1,20 @@ +Upstream-Status: Submitted [bug-parted@gnu.org] + +| for po in `ls -1 ./*.pt_BR.po 2>/dev/null`; do \ +| make $(basename ${po%.pt_BR.po}); \ +| done +| Makefile:904: *** Recursive variable `mandir' references itself (eventually). Stop. + +Signed-off-by: Andreas Oberritter + +--- parted-3.1/doc/po4a.mk.orig 2012-03-15 14:09:11.555831872 +0100 ++++ parted-3.1/doc/po4a.mk 2012-03-15 14:10:44.243830985 +0100 +@@ -23,7 +23,7 @@ + # threshold is 80%), it won't be distributed, and the build won't fail. + # + +-mandir = $(mandir)/$(lang) ++mandir := $(mandir)/$(lang) + + # Inform automake that we want to install some man pages in section 1, 5 + # and 8. diff --git a/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch b/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch new file mode 100644 index 0000000000..3110a724f8 --- /dev/null +++ b/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch @@ -0,0 +1,24 @@ +Upstream-Status: Submitted [bug-parted@gnu.org] + +Initialize (version-)prefix to prevent inheritance from +the build environment during autoreconf. + +| sed: -e expression #1, char 9: unknown option to `s' +| configure.ac:55: error: AC_INIT should be called with package and version arguments +| aclocal.m4:594: AM_INIT_AUTOMAKE is expanded from... +| configure.ac:55: the top level +| autom4te: /usr/bin/m4 failed with exit status: 1 + +Signed-off-by: Andreas Oberritter + +--- parted-3.1/build-aux/git-version-gen.orig 2012-03-15 13:51:38.911841912 +0100 ++++ parted-3.1/build-aux/git-version-gen 2012-03-15 13:51:50.171841800 +0100 +@@ -92,6 +92,8 @@ + + Running without arguments will suffice in most cases." + ++prefix="v" ++ + while test $# -gt 0; do + case $1 in + --help) echo "$usage"; exit 0;; diff --git a/meta/recipes-extended/parted/parted-3.1/no_check.patch b/meta/recipes-extended/parted/parted-3.1/no_check.patch new file mode 100644 index 0000000000..58d8db4426 --- /dev/null +++ b/meta/recipes-extended/parted/parted-3.1/no_check.patch @@ -0,0 +1,20 @@ +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-3.1/syscalls.patch b/meta/recipes-extended/parted/parted-3.1/syscalls.patch new file mode 100644 index 0000000000..e9bbe9a956 --- /dev/null +++ b/meta/recipes-extended/parted/parted-3.1/syscalls.patch @@ -0,0 +1,55 @@ +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 ++ + #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/recipes-extended/parted/parted_3.0.bb b/meta/recipes-extended/parted/parted_3.0.bb deleted file mode 100644 index 2fba6d1446..0000000000 --- a/meta/recipes-extended/parted/parted_3.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "parted, the GNU partition resizing program" -HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" -SECTION = "console/tools" -DEPENDS = "readline e2fsprogs" -PR = "r0" - -SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ - file://no_check.patch \ - file://syscalls.patch " - -SRC_URI[md5sum] = "a94e84a9b9944715c4453f82ccc639bf" -SRC_URI[sha256sum] = "8886eece015202f6bd5ce8414f4b68838452cef509f2e3389ad56128219837b7" - -EXTRA_OECONF = "--disable-device-mapper" - -inherit autotools pkgconfig gettext - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/parted/parted_3.1.bb b/meta/recipes-extended/parted/parted_3.1.bb new file mode 100644 index 0000000000..267e53b4f1 --- /dev/null +++ b/meta/recipes-extended/parted/parted_3.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs" +PR = "r0" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ + file://no_check.patch \ + file://syscalls.patch \ + file://fix-git-version-gen.patch \ + file://fix-doc-mandir.patch" + +SRC_URI[md5sum] = "5d89d64d94bcfefa9ce8f59f4b81bdcb" +SRC_URI[sha256sum] = "5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15" + +EXTRA_OECONF = "--disable-device-mapper" + +inherit autotools pkgconfig gettext + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf