diff options
| -rw-r--r-- | meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch | 49 | ||||
| -rw-r--r-- | meta/recipes-extended/parted/parted_3.1.bb | 2 |
2 files changed, 35 insertions, 16 deletions
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 index 3110a724f..a9f26e978 100644 --- 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 @@ -1,24 +1,43 @@ -Upstream-Status: Submitted [bug-parted@gnu.org] +Upstream-Status: Accepted [Expected to be included in parted versions > 3.1] +Upstream-URL: http://git.savannah.gnu.org/cgit/gnulib.git/patch/?id=cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9 -Initialize (version-)prefix to prevent inheritance from -the build environment during autoreconf. +From cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9 Mon Sep 17 00:00:00 2001 +From: Andreas Oberritter <obi@opendreambox.org> +Date: Sun, 18 Mar 2012 17:39:14 +0000 +Subject: git-version-gen: don't let "prefix" envvar cause trouble -| 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 <obi@opendreambox.org> - ---- 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 @@ +* build-aux/git-version-gen (prefix): Initialize properly, +so as not to use a value specified via the environment. +Details here: http://thread.gmane.org/gmane.comp.gnu.parted.bugs/10810 +--- +diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen +index d5542a2..0fa9063 100755 +--- a/build-aux/git-version-gen ++++ b/build-aux/git-version-gen +@@ -1,6 +1,6 @@ + #!/bin/sh + # Print a version string. +-scriptversion=2012-01-06.07; # UTC ++scriptversion=2012-03-18.17; # UTC + + # Copyright (C) 2007-2012 Free Software Foundation, Inc. + # +@@ -92,6 +92,8 @@ Options: Running without arguments will suffice in most cases." -+prefix="v" ++prefix=v + while test $# -gt 0; do case $1 in --help) echo "$usage"; exit 0;; +@@ -120,7 +122,6 @@ if test -z "$tarball_version_file"; then + fi + + tag_sed_script="${tag_sed_script:-s/x/x/}" +-prefix="${prefix:-v}" + + nl=' + ' +-- +cgit v0.9.0.2 diff --git a/meta/recipes-extended/parted/parted_3.1.bb b/meta/recipes-extended/parted/parted_3.1.bb index 267e53b4f..21d3a66b7 100644 --- a/meta/recipes-extended/parted/parted_3.1.bb +++ b/meta/recipes-extended/parted/parted_3.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" SECTION = "console/tools" -DEPENDS = "readline e2fsprogs" +DEPENDS = "ncurses readline util-linux" PR = "r0" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ |