From 83cc22ea82b50acd8cf24ffa6cd5d8e54c78a3b2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 19 Jan 2015 15:35:18 -0600 Subject: Revert "Revert "add patch to build parted without libdevmapper"" This reverts commit d37dcbf6180a50306135f0edef465cddbbe95083. --- .../parted/patches/patch-libparted_arch_linux_c | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/parted/patches/patch-libparted_arch_linux_c (limited to 'package/parted') diff --git a/package/parted/patches/patch-libparted_arch_linux_c b/package/parted/patches/patch-libparted_arch_linux_c new file mode 100644 index 000000000..7a8efcf04 --- /dev/null +++ b/package/parted/patches/patch-libparted_arch_linux_c @@ -0,0 +1,41 @@ +--- 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; -- cgit v1.2.3