Merge branch 'master' of ssh://git@git.moblin.org/poky

2 files changed, 19 insertions, 1 deletions

diff --git a/meta/packages/parted/parted-1.8.8/no_check.patch b/meta/packages/parted/parted-1.8.8/no_check.patch
new file mode 100644
index 0000000000..22d364a0a7
--- /dev/null
+++ b/meta/packages/parted/parted-1.8.8/no_check.patch
@@ -0,0 +1,17 @@
+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.bb b/meta/packages/parted/parted_1.8.8.bb
index 610dc50476..0e0332b70f 100644
--- a/meta/packages/parted/parted_1.8.8.bb
+++ b/meta/packages/parted/parted_1.8.8.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv2"
 SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs"
-PR = "r2"
+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"