Skip to contentSkip to conversation

parted: upgrade to 3.2

PATCH New Hongxu Jia 1 participant 2 messages Nov 13, 2014

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

v2 cover parted: upgrade to 3.2

Changed in V2:
Remove the obsolete parted-3.1 dir.

//Hongxu

The following changes since commit 3c741a8d33acbf4b3d5eecc04533bc76e2f37253:

oprofile: 0.9.9 -> 1.0.0 (2014-11-09 10:21:24 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/upgrade-parted
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-meta-oe

Hongxu Jia (1):
parted: upgrade to 3.2

 .../parted/{parted-3.1 => files}/Makefile          |  0
 .../files/fix-compile-failure-while-dis.patch      | 57 ++++++++++++++++++++++
 .../{parted-3.1 => files}/fix-doc-mandir.patch     |  0
 .../parted/{parted-3.1 => files}/no_check.patch    |  0
 .../parted/{parted-3.1 => files}/run-ptest         |  0
 .../parted/{parted-3.1 => files}/syscalls.patch    |  0
 .../parted-3.1/fix-deprecated-readline.patch       | 34 -------------
 .../parted/parted-3.1/fix-dvh-overflows.patch      | 35 -------------
 .../parted/parted-3.1/fix-git-version-gen.patch    | 43 ----------------
 .../parted/{parted_3.1.bb => parted_3.2.bb}        |  8 ++-
 10 files changed, 60 insertions(+), 117 deletions(-)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/Makefile (100%)
 create mode 100644 meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
 rename meta/recipes-extended/parted/{parted-3.1 => files}/fix-doc-mandir.patch (100%)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/no_check.patch (100%)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/run-ptest (100%)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/syscalls.patch (100%)
 delete mode 100644 meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch
 delete mode 100644 meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch
 delete mode 100644 meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch
 rename meta/recipes-extended/parted/{parted_3.1.bb => parted_3.2.bb} (79%)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v2 1/1 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

---
 .../parted/{parted-3.1 => files}/Makefile          |  0
 .../files/fix-compile-failure-while-dis.patch      | 57 ++++++++++++++++++++++
 .../{parted-3.1 => files}/fix-doc-mandir.patch     |  0
 .../parted/{parted-3.1 => files}/no_check.patch    |  0
 .../parted/{parted-3.1 => files}/run-ptest         |  0
 .../parted/{parted-3.1 => files}/syscalls.patch    |  0
 .../parted-3.1/fix-deprecated-readline.patch       | 34 -------------
 .../parted/parted-3.1/fix-dvh-overflows.patch      | 35 -------------
 .../parted/parted-3.1/fix-git-version-gen.patch    | 43 ----------------
 .../parted/{parted_3.1.bb => parted_3.2.bb}        |  8 ++-
 10 files changed, 60 insertions(+), 117 deletions(-)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/Makefile (100%)
 create mode 100644 meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
 rename meta/recipes-extended/parted/{parted-3.1 => files}/fix-doc-mandir.patch (100%)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/no_check.patch (100%)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/run-ptest (100%)
 rename meta/recipes-extended/parted/{parted-3.1 => files}/syscalls.patch (100%)
 delete mode 100644 meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch
 delete mode 100644 meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch
 delete mode 100644 meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch
 rename meta/recipes-extended/parted/{parted_3.1.bb => parted_3.2.bb} (79%)
meta/recipes-extended/parted/files/Makefile renamed from meta/recipes-extended/parted/parted-3.1/Makefile +0 -0
similarity index 100%
rename from meta/recipes-extended/parted/parted-3.1/Makefile
rename to meta/recipes-extended/parted/files/Makefile
meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch new file +57 -0

57 lines not on this page · raw message

meta/recipes-extended/parted/files/fix-doc-mandir.patch renamed from meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/parted/parted-3.1/fix-doc-mandir.patch
rename to meta/recipes-extended/parted/files/fix-doc-mandir.patch
meta/recipes-extended/parted/files/no_check.patch renamed from meta/recipes-extended/parted/parted-3.1/no_check.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/parted/parted-3.1/no_check.patch
rename to meta/recipes-extended/parted/files/no_check.patch
meta/recipes-extended/parted/files/run-ptest renamed from meta/recipes-extended/parted/parted-3.1/run-ptest +0 -0
similarity index 100%
rename from meta/recipes-extended/parted/parted-3.1/run-ptest
rename to meta/recipes-extended/parted/files/run-ptest
meta/recipes-extended/parted/files/syscalls.patch renamed from meta/recipes-extended/parted/parted-3.1/syscalls.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/parted/parted-3.1/syscalls.patch
rename to meta/recipes-extended/parted/files/syscalls.patch
meta/recipes-extended/parted/parted-3.1/fix-deprecated-readline.patch deleted +0 -34
deleted file mode 100644
index c4ca06d..0000000
@@ -1,34 +0,0 @@
-
-From: Gustavo Zacarias
-Subject: bug#16929: [PATCH] ui: switch to new-style readline typedef
-Date: Mon, 3 Mar 2014 10:40:08 -0300
-
-The CPPFunction typedef (among others) have been deprecated in favour of
-specific prototyped typedefs since readline 4.2 (circa 2001).
-It's been working since because compatibility typedefs have been in
-place until they where removed in the recent readline 6.3 release.
-Switch to the new style to avoid build breakage.
-
-Signed-off-by: Gustavo Zacarias <address@hidden>
-
-Upstream-Status: Backport
-
-Signed-off-by: Saul Wold <[email protected]>
-
----
- parted/ui.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/parted/ui.c b/parted/ui.c
-index 786deed..b33f6fc 100644
---- a/parted/ui.c
-+++ b/parted/ui.c
-@@ -1470,7 +1470,7 @@ init_readline (void)
- #ifdef HAVE_LIBREADLINE
-   if (!opt_script_mode) {
-     rl_initialize ();
--    rl_attempted_completion_function = (CPPFunction*) complete_function;
-+    rl_attempted_completion_function = (rl_completion_func_t *) complete_function;
-     readline_state.in_readline = 0;
-   }
- #endif
meta/recipes-extended/parted/parted-3.1/fix-dvh-overflows.patch deleted +0 -35
deleted file mode 100644
index b1eae97..0000000
@@ -1,35 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Ming Liu <[email protected]>
----
- dvh.h |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: parted-3.1/libparted/labels/dvh.h
-===================================================================
---- parted-3.1.orig/libparted/labels/dvh.h	2013-02-25 10:46:13.204477586 +0800
-+++ parted-3.1/libparted/labels/dvh.h	2013-02-25 10:47:20.954477065 +0800
-@@ -112,8 +112,8 @@ struct device_parameters {
- 
- struct volume_directory {
- 	char	vd_name[VDNAMESIZE];	/* name */
--	int	vd_lbn;			/* logical block number */
--	int	vd_nbytes;		/* file length in bytes */
-+	unsigned int	vd_lbn;		/* logical block number */
-+	unsigned int	vd_nbytes;	/* file length in bytes */
- };
- 
- /*
-@@ -125,9 +125,9 @@ struct volume_directory {
-  * NOTE: pt_firstlbn SHOULD BE CYLINDER ALIGNED
-  */
- struct partition_table {		/* one per logical partition */
--	int	pt_nblks;		/* # of logical blks in partition */
--	int	pt_firstlbn;		/* first lbn of partition */
--	int	pt_type;		/* use of partition */
-+	unsigned int	pt_nblks;	/* # of logical blks in partition */
-+	unsigned int	pt_firstlbn;	/* first lbn of partition */
-+	int		pt_type;	/* use of partition */
- };
- 
- #define	PTYPE_VOLHDR	0		/* partition is volume header */
meta/recipes-extended/parted/parted-3.1/fix-git-version-gen.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-extended/parted/parted_3.2.bb renamed from meta/recipes-extended/parted/parted_3.1.bb +3 -5
similarity index 79%
rename from meta/recipes-extended/parted/parted_3.1.bb
rename to meta/recipes-extended/parted/parted_3.2.bb
index 9057463..655a825 100644
@@ -9,16 +9,14 @@ PR = "r1"
 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 \
-           file://fix-dvh-overflows.patch \
-           file://fix-deprecated-readline.patch \
+           file://fix-compile-failure-while-dis.patch \
            file://run-ptest \
            file://Makefile \
 "
 
-SRC_URI[md5sum] = "5d89d64d94bcfefa9ce8f59f4b81bdcb"
-SRC_URI[sha256sum] = "5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15"
+SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb"
+SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
 
 EXTRA_OECONF = "--disable-device-mapper"
 
Signature · 1 line
1.9.1