From: Joerg Seitter oss@seitter.net
Signed-off-by: Joerg Seitter oss@seitter.net --- package/parted/Makefile | 6 ++-- .../parted/patches/patch-libparted_arch_linux_c | 41 ---------------------- 2 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 package/parted/patches/patch-libparted_arch_linux_c
diff --git a/package/parted/Makefile b/package/parted/Makefile index 41e59b96c..86528d6ae 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= parted -PKG_VERSION:= 3.2 -PKG_RELEASE:= 3 -PKG_HASH:= 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 +PKG_VERSION:= 3.3 +PKG_RELEASE:= 4 +PKG_HASH:= 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 PKG_DESCR:= partition table editor PKG_SECTION:= sys/fs PKG_DEPENDS:= libblkid libuuid libncurses diff --git a/package/parted/patches/patch-libparted_arch_linux_c b/package/parted/patches/patch-libparted_arch_linux_c deleted file mode 100644 index 7a8efcf04..000000000 --- a/package/parted/patches/patch-libparted_arch_linux_c +++ /dev/null @@ -1,41 +0,0 @@ ---- parted-3.2.orig/libparted/arch/linux.c 2014-06-15 14:15:54.000000000 -0500 -+++ parted-3.2/libparted/arch/linux.c 2015-01-03 14:10:43.244848741 -0600 -@@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...) - return r < 0 ? NULL : resultp; - } - -+#ifdef ENABLE_DEVICE_MAPPER - static char * - dm_canonical_path (PedDevice const *dev) - { -@@ -2326,12 +2327,17 @@ dm_canonical_path (PedDevice const *dev) - err: - return NULL; - } -+#endif - - static char* - _device_get_part_path (PedDevice const *dev, int num) - { -+#ifdef ENABLE_DEVICE_MAPPER - char *devpath = (dev->type == PED_DEVICE_DM - ? dm_canonical_path (dev) : dev->path); -+#else -+ char *devpath = dev->path; -+#endif - size_t path_len = strlen (devpath); - char *result; - /* Check for devfs-style /disc => /partN transformation -@@ -2946,10 +2952,12 @@ _disk_sync_part_table (PedDisk* disk) - - - if (disk->dev->type == PED_DEVICE_DM) { -+#ifdef ENABLE_DEVICE_MAPPER - 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; -+#endif - } else { - add_partition = _blkpg_add_partition; - remove_partition = _blkpg_remove_partition;