Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (58085d7c39a68cd179245f7c4799b0f5b6cbe0f3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (58085d7c39a68cd179245f7c4799b0f5b6cbe0f3)
  • Date: Sun, 15 Mar 2015 17:37:40 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

disk/parted/HISTORY | 4 ++++
disk/parted/PRE_BUILD | 4 ++++
disk/parted/no-dm.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)

New commits:
commit 58085d7c39a68cd179245f7c4799b0f5b6cbe0f3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

parted: fixed build

diff --git a/disk/parted/HISTORY b/disk/parted/HISTORY
index 9e89fe7..497d01a 100644
--- a/disk/parted/HISTORY
+++ b/disk/parted/HISTORY
@@ -1,3 +1,7 @@
+2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * no-dm.patch: added, from upstream bug #18147
+
2015-02-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: Updated to 3.2

diff --git a/disk/parted/PRE_BUILD b/disk/parted/PRE_BUILD
new file mode 100755
index 0000000..1a05c63
--- /dev/null
+++ b/disk/parted/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/no-dm.patch"
diff --git a/disk/parted/no-dm.patch b/disk/parted/no-dm.patch
new file mode 100644
index 0000000..e866c88
--- /dev/null
+++ b/disk/parted/no-dm.patch
@@ -0,0 +1,44 @@
+--- parted-3.2/libparted/arch/linux.c.device-mapper 2014-06-15
20:15:54.000000000 +0100
++++ parted-3.2/libparted/arch/linux.c 2014-07-29 22:27:54.487430030 +0100
+@@ -2307,6 +2307,7 @@ zasprintf (const char *format, ...)
+ 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_canonical_path (PedDevice const *dev)
+ dm_task_destroy (task);
+ return dev_name;
+ err:
++#endif
+ return NULL;
+ }
+
+@@ -2944,13 +2946,14 @@ _disk_sync_part_table (PedDisk* disk)
+ 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 @@ _disk_sync_part_table (PedDisk* disk)
+ 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 */



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (58085d7c39a68cd179245f7c4799b0f5b6cbe0f3), Vlad Glagolev, 03/15/2015

Archive powered by MHonArc 2.6.24.

Top of Page