summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-11-13 04:50:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:08:12 (GMT)
commitaa2c1548b3e5ad06468bf86a242d2a2032aa652d (patch)
tree981e8959d47ab17c0f66ad93b3f9cff37a290f84
parent8aa5f17b08193aeebd58e58ba64f247109f3bd03 (diff)
downloadpoky-aa2c1548b3e5ad06468bf86a242d2a2032aa652d.tar.gz
parted: upgrade to 3.2
Drop fix-git-version-gen.patch, fix-dvh-overflows.patch and fix-deprecated-readline.patch, because the parted 3.2 have merged them. Add fix-compile-failure-while-dis.patch to fix compile failure (From OE-Core rev: 5faae24198ded58c5328e9f3e5ab99c89047a57d) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/files/Makefile (renamed from meta/recipes-extended/parted/parted-3.1/Makefile)0
-rw-r--r--meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch57
-rw-r--r--meta/recipes-extended/parted/files/fix-doc-mandir.patch (renamed from meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch)0
-rw-r--r--meta/recipes-extended/parted/files/no_check.patch (renamed from meta/recipes-extended/parted/parted-3.1/no_check.patch)0
-rw-r--r--meta/recipes-extended/parted/files/run-ptest (renamed from meta/recipes-extended/parted/parted-3.1/run-ptest)0
-rw-r--r--meta/recipes-extended/parted/files/syscalls.patch (renamed from meta/recipes-extended/parted/parted-3.1/syscalls.patch)0
-rw-r--r--meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch34
-rw-r--r--meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch35
-rw-r--r--meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch43
-rw-r--r--meta/recipes-extended/parted/parted_3.2.bb (renamed from meta/recipes-extended/parted/parted_3.1.bb)8
10 files changed, 60 insertions, 117 deletions
diff --git a/meta/recipes-extended/parted/parted-3.1/Makefile b/meta/recipes-extended/parted/files/Makefile
index ee90be0..ee90be0 100644
--- a/meta/recipes-extended/parted/parted-3.1/Makefile
+++ b/meta/recipes-extended/parted/files/Makefile
diff --git a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
new file mode 100644
index 0000000..68ab715
--- /dev/null
+++ b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
@@ -0,0 +1,57 @@
1From 060e74354774d36d2c11ef08e3e7ea9b9b6e23fb Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 13 Nov 2014 11:29:33 +0800
4Subject: [PATCH] libparted/arch/linux.c: fix compile failure while
5 --disable-device-mapper
6
7While --disable-device-mapper, the MACRO ENABLE_DEVICE_MAPPER is
8undef, but it missed to scope some device mapper functions.
9
10Upstream-Status: Pending
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 libparted/arch/linux.c | 8 ++++++--
15 1 file changed, 6 insertions(+), 2 deletions(-)
16
17diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
18index 6fd73c5..2afa479 100644
19--- a/libparted/arch/linux.c
20+++ b/libparted/arch/linux.c
21@@ -2320,6 +2320,7 @@ zasprintf (const char *format, ...)
22 static char *
23 dm_canonical_path (PedDevice const *dev)
24 {
25+#ifdef ENABLE_DEVICE_MAPPER
26 LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev);
27
28 /* Get map name from devicemapper */
29@@ -2337,6 +2338,7 @@ dm_canonical_path (PedDevice const *dev)
30 dm_task_destroy (task);
31 return dev_name;
32 err:
33+#endif
34 return NULL;
35 }
36
37@@ -2957,13 +2959,15 @@ _disk_sync_part_table (PedDisk* disk)
38 unsigned long long *start,
39 unsigned long long *length);
40
41-
42+#ifdef ENABLE_DEVICE_MAPPER
43 if (disk->dev->type == PED_DEVICE_DM) {
44 add_partition = _dm_add_partition;
45 remove_partition = _dm_remove_partition;
46 resize_partition = _dm_resize_partition;
47 get_partition_start_and_length = _dm_get_partition_start_and_length;
48- } else {
49+ } else
50+#endif
51+ {
52 add_partition = _blkpg_add_partition;
53 remove_partition = _blkpg_remove_partition;
54 #ifdef BLKPG_RESIZE_PARTITION
55--
561.9.1
57
diff --git a/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch b/meta/recipes-extended/parted/files/fix-doc-mandir.patch
index 0711d4e..0711d4e 100644
--- a/meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch
+++ b/meta/recipes-extended/parted/files/fix-doc-mandir.patch
diff --git a/meta/recipes-extended/parted/parted-3.1/no_check.patch b/meta/recipes-extended/parted/files/no_check.patch
index 58d8db4..58d8db4 100644
--- a/meta/recipes-extended/parted/parted-3.1/no_check.patch
+++ b/meta/recipes-extended/parted/files/no_check.patch
diff --git a/meta/recipes-extended/parted/parted-3.1/run-ptest b/meta/recipes-extended/parted/files/run-ptest
index 695c5e8..695c5e8 100644
--- a/meta/recipes-extended/parted/parted-3.1/run-ptest
+++ b/meta/recipes-extended/parted/files/run-ptest
diff --git a/meta/recipes-extended/parted/parted-3.1/syscalls.patch b/meta/recipes-extended/parted/files/syscalls.patch
index e9bbe9a..e9bbe9a 100644
--- a/meta/recipes-extended/parted/parted-3.1/syscalls.patch
+++ b/meta/recipes-extended/parted/files/syscalls.patch
diff --git a/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch b/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch
deleted file mode 100644
index c4ca06d..0000000
--- a/meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1
2From: Gustavo Zacarias
3Subject: bug#16929: [PATCH] ui: switch to new-style readline typedef
4Date: Mon, 3 Mar 2014 10:40:08 -0300
5
6The CPPFunction typedef (among others) have been deprecated in favour of
7specific prototyped typedefs since readline 4.2 (circa 2001).
8It's been working since because compatibility typedefs have been in
9place until they where removed in the recent readline 6.3 release.
10Switch to the new style to avoid build breakage.
11
12Signed-off-by: Gustavo Zacarias <address@hidden>
13
14Upstream-Status: Backport
15
16Signed-off-by: Saul Wold <sgw@linux.intel.com>
17
18---
19 parted/ui.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/parted/ui.c b/parted/ui.c
23index 786deed..b33f6fc 100644
24--- a/parted/ui.c
25+++ b/parted/ui.c
26@@ -1470,7 +1470,7 @@ init_readline (void)
27 #ifdef HAVE_LIBREADLINE
28 if (!opt_script_mode) {
29 rl_initialize ();
30- rl_attempted_completion_function = (CPPFunction*) complete_function;
31+ rl_attempted_completion_function = (rl_completion_func_t *) complete_function;
32 readline_state.in_readline = 0;
33 }
34 #endif
diff --git a/meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch b/meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch
deleted file mode 100644
index b1eae97..0000000
--- a/meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Ming Liu <ming.liu@windriver.com>
4---
5 dvh.h | 10 +++++-----
6 1 file changed, 5 insertions(+), 5 deletions(-)
7
8Index: parted-3.1/libparted/labels/dvh.h
9===================================================================
10--- parted-3.1.orig/libparted/labels/dvh.h 2013-02-25 10:46:13.204477586 +0800
11+++ parted-3.1/libparted/labels/dvh.h 2013-02-25 10:47:20.954477065 +0800
12@@ -112,8 +112,8 @@ struct device_parameters {
13
14 struct volume_directory {
15 char vd_name[VDNAMESIZE]; /* name */
16- int vd_lbn; /* logical block number */
17- int vd_nbytes; /* file length in bytes */
18+ unsigned int vd_lbn; /* logical block number */
19+ unsigned int vd_nbytes; /* file length in bytes */
20 };
21
22 /*
23@@ -125,9 +125,9 @@ struct volume_directory {
24 * NOTE: pt_firstlbn SHOULD BE CYLINDER ALIGNED
25 */
26 struct partition_table { /* one per logical partition */
27- int pt_nblks; /* # of logical blks in partition */
28- int pt_firstlbn; /* first lbn of partition */
29- int pt_type; /* use of partition */
30+ unsigned int pt_nblks; /* # of logical blks in partition */
31+ unsigned int pt_firstlbn; /* first lbn of partition */
32+ int pt_type; /* use of partition */
33 };
34
35 #define PTYPE_VOLHDR 0 /* partition is volume header */
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
deleted file mode 100644
index a9f26e9..0000000
--- a/meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
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
3
4From cbc11ff0020eb9c04caea6b3e7dc4e4281dff1f9 Mon Sep 17 00:00:00 2001
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
8
9* build-aux/git-version-gen (prefix): Initialize properly,
10so as not to use a value specified via the environment.
11Details here: http://thread.gmane.org/gmane.comp.gnu.parted.bugs/10810
12---
13diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
14index d5542a2..0fa9063 100755
15--- a/build-aux/git-version-gen
16+++ b/build-aux/git-version-gen
17@@ -1,6 +1,6 @@
18 #!/bin/sh
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:
26
27 Running without arguments will suffice in most cases."
28
29+prefix=v
30+
31 while test $# -gt 0; do
32 case $1 in
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.2.bb
index 9057463..655a825 100644
--- a/meta/recipes-extended/parted/parted_3.1.bb
+++ b/meta/recipes-extended/parted/parted_3.2.bb
@@ -9,16 +9,14 @@ PR = "r1"
9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://no_check.patch \ 10 file://no_check.patch \
11 file://syscalls.patch \ 11 file://syscalls.patch \
12 file://fix-git-version-gen.patch \
13 file://fix-doc-mandir.patch \ 12 file://fix-doc-mandir.patch \
14 file://fix-dvh-overflows.patch \ 13 file://fix-compile-failure-while-dis.patch \
15 file://fix-deprecated-readline.patch \
16 file://run-ptest \ 14 file://run-ptest \
17 file://Makefile \ 15 file://Makefile \
18" 16"
19 17
20SRC_URI[md5sum] = "5d89d64d94bcfefa9ce8f59f4b81bdcb" 18SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb"
21SRC_URI[sha256sum] = "5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15" 19SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
22 20
23EXTRA_OECONF = "--disable-device-mapper" 21EXTRA_OECONF = "--disable-device-mapper"
24 22