summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-21 14:08:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 15:33:06 (GMT)
commit5259a706ec53807fda6af690d0078307622af06a (patch)
tree2c04be039fbc2c7af36859f9cffe2a43022c3e45 /meta/recipes-extended
parente3a848699e891c019c974c6f9f9f8597ac6d633f (diff)
downloadpoky-5259a706ec53807fda6af690d0078307622af06a.tar.gz
parted: update to version 3.1
* Supports disks > 2TB [RP:Add in missing delta of fixed in subsequent version] (From OE-Core rev: daa6d80d902cb35af1b3f3f1e9e55cb944eb2de0) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch49
-rw-r--r--meta/recipes-extended/parted/parted_3.1.bb2
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 3110a72..a9f26e9 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 @@
1Upstream-Status: Submitted [bug-parted@gnu.org] 1Upstream-Status: Accepted [Expected to be included in parted versions > 3.1]
2Upstream-URL: http://git.savannah.gnu.org/cgit/gnulib.git/patch/?id=cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9
2 3
3Initialize (version-)prefix to prevent inheritance from 4From cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9 Mon Sep 17 00:00:00 2001
4the build environment during autoreconf. 5From: Andreas Oberritter <obi@opendreambox.org>
6Date: Sun, 18 Mar 2012 17:39:14 +0000
7Subject: git-version-gen: don't let "prefix" envvar cause trouble
5 8
6| sed: -e expression #1, char 9: unknown option to `s' 9* build-aux/git-version-gen (prefix): Initialize properly,
7| configure.ac:55: error: AC_INIT should be called with package and version arguments 10so as not to use a value specified via the environment.
8| aclocal.m4:594: AM_INIT_AUTOMAKE is expanded from... 11Details here: http://thread.gmane.org/gmane.comp.gnu.parted.bugs/10810
9| configure.ac:55: the top level 12---
10| autom4te: /usr/bin/m4 failed with exit status: 1 13diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
11 14index d5542a2..0fa9063 100755
12Signed-off-by: Andreas Oberritter <obi@opendreambox.org> 15--- a/build-aux/git-version-gen
13 16+++ b/build-aux/git-version-gen
14--- parted-3.1/build-aux/git-version-gen.orig 2012-03-15 13:51:38.911841912 +0100 17@@ -1,6 +1,6 @@
15+++ parted-3.1/build-aux/git-version-gen 2012-03-15 13:51:50.171841800 +0100 18 #!/bin/sh
16@@ -92,6 +92,8 @@ 19 # Print a version string.
20-scriptversion=2012-01-06.07; # UTC
21+scriptversion=2012-03-18.17; # UTC
22
23 # Copyright (C) 2007-2012 Free Software Foundation, Inc.
24 #
25@@ -92,6 +92,8 @@ Options:
17 26
18 Running without arguments will suffice in most cases." 27 Running without arguments will suffice in most cases."
19 28
20+prefix="v" 29+prefix=v
21+ 30+
22 while test $# -gt 0; do 31 while test $# -gt 0; do
23 case $1 in 32 case $1 in
24 --help) echo "$usage"; exit 0;; 33 --help) echo "$usage"; exit 0;;
34@@ -120,7 +122,6 @@ if test -z "$tarball_version_file"; then
35 fi
36
37 tag_sed_script="${tag_sed_script:-s/x/x/}"
38-prefix="${prefix:-v}"
39
40 nl='
41 '
42--
43cgit 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 267e53b..21d3a66 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"
3LICENSE = "GPLv3+" 3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" 4LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c"
5SECTION = "console/tools" 5SECTION = "console/tools"
6DEPENDS = "readline e2fsprogs" 6DEPENDS = "ncurses readline util-linux"
7PR = "r0" 7PR = "r0"
8 8
9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \