From d3ce3a89fb424ebd8939db30840c9fb57fa3cd9d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Aug 2014 02:02:23 +0200 Subject: [PATCH] parted: update to parted-3.2 Signed-off-by: Stephan Raue --- packages/sysutils/parted/package.mk | 2 +- .../parted/patches/parted-buildfix.patch | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 packages/sysutils/parted/patches/parted-buildfix.patch diff --git a/packages/sysutils/parted/package.mk b/packages/sysutils/parted/package.mk index f14befe8de..39573d3838 100644 --- a/packages/sysutils/parted/package.mk +++ b/packages/sysutils/parted/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="parted" -PKG_VERSION="3.1" +PKG_VERSION="3.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/parted/patches/parted-buildfix.patch b/packages/sysutils/parted/patches/parted-buildfix.patch new file mode 100644 index 0000000000..88b2ada7ea --- /dev/null +++ b/packages/sysutils/parted/patches/parted-buildfix.patch @@ -0,0 +1,45 @@ +diff -Naur parted-3.2/libparted/arch/linux.c parted-3.2.patch/libparted/arch/linux.c +--- parted-3.2/libparted/arch/linux.c 2014-06-15 21:15:54.000000000 +0200 ++++ parted-3.2.patch/libparted/arch/linux.c 2014-08-04 01:57:47.626611437 +0200 +@@ -2307,6 +2307,7 @@ + static char * + dm_canonical_path (PedDevice const *dev) + { ++#ifdef ENABLE_DEVICE_MAPPER + LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev); + + /* Get map name from devicemapper */ +@@ -2324,6 +2325,7 @@ + dm_task_destroy (task); + return dev_name; + err: ++#endif + return NULL; + } + +@@ -2944,13 +2946,14 @@ + unsigned long long *start, + unsigned long long *length); + +- ++#ifdef ENABLE_DEVICE_MAPPER + if (disk->dev->type == PED_DEVICE_DM) { + add_partition = _dm_add_partition; + remove_partition = _dm_remove_partition; + resize_partition = _dm_resize_partition; + get_partition_start_and_length = _dm_get_partition_start_and_length; + } else { ++#endif + add_partition = _blkpg_add_partition; + remove_partition = _blkpg_remove_partition; + #ifdef BLKPG_RESIZE_PARTITION +@@ -2959,7 +2962,9 @@ + resize_partition = NULL; + #endif + get_partition_start_and_length = _kernel_get_partition_start_and_length; ++#ifdef ENABLE_DEVICE_MAPPER + } ++#endif + + /* lpn = largest partition number. + * for remove pass, use greater of device or label limit */