From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 15 Dec 2014 04:01:56 +0000 (-0500)
Subject: Upgrade to parted-3.2 and gparted-0.20.0
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=81a6804d0ad8b589a12c2e02a434f528988ab02c;p=hvlinux.git

Upgrade to parted-3.2 and gparted-0.20.0
---

diff --git a/config/packages-list b/config/packages-list
index 0260279..46c15f1 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -135,7 +135,7 @@ GNUPG="gnupg-1.4.12"
 GNUTLS="gnutls-3.3.11"
 GOBJECT_INSTROSPECTION="gobject-introspection-1.42.0"
 GOFFICE="goffice-0.8.17"
-GPARTED="gparted-0.16.1"
+GPARTED="gparted-0.20.0"
 GPERF="gperf-3.0.4"
 GPTFDISK="gptfdisk-0.8.7"
 GREP="grep-2.14"
@@ -304,7 +304,7 @@ OPENSSL_ROOT_CERTS="BLFS-ca-bundle-3.12.8.0"
 PAM="Linux-PAM-1.1.8"
 PANGO="pango-1.36.8"
 PANGOMM="pangomm-2.34.0"
-PARTED="parted-3.1"
+PARTED="parted-3.2"
 PATCH_PACKAGE="patch-2.7.1"
 PCIUTILS="pciutils-3.2.0"
 MENU_CACHE="menu-cache-0.3.3"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index ff66308..dbb08c9 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -87,7 +87,7 @@ ipkg ${CPIO} "\
 
 ipkg ${SCREEN}
 
-ipkg ${PARTED} "--disable-device-mapper"
+ipkg ${PARTED} "--disable-static --disable-device-mapper"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}
 ipkg -m noac ${DOSFSTOOLS}
diff --git a/stage3/patches/common/parted-3.2-devmapper-1.patch b/stage3/patches/common/parted-3.2-devmapper-1.patch
new file mode 100644
index 0000000..fc50221
--- /dev/null
+++ b/stage3/patches/common/parted-3.2-devmapper-1.patch
@@ -0,0 +1,69 @@
+Submitted By:            Ken Moffat <ken at linuxfromscratch dot org>
+Date:                    2014-08-16
+Initial Package Version: 3.2
+Upstream Status:         Unknown
+Origin:                  Funtoo Linux
+URL:                     http://data.gpo.zugaina.org/funtoo/sys-block/parted/files/parted-3.2-devmapper.patch
+Description:             Parted-3.2 fails to build with --disable-device-mapper
+
+
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -2304,6 +2304,7 @@
+   return r < 0 ? NULL : resultp;
+ }
+ 
++#ifdef ENABLE_DEVICE_MAPPER
+ static char *
+ dm_canonical_path (PedDevice const *dev)
+ {
+@@ -2326,12 +2327,22 @@
+ err:
+         return NULL;
+ }
++#endif /* ENABLE_DEVICE_MAPPER */
+ 
+ static char*
+ _device_get_part_path (PedDevice const *dev, int num)
+ {
+-        char *devpath = (dev->type == PED_DEVICE_DM
+-                         ? dm_canonical_path (dev) : dev->path);
++        char *devpath =
++#ifdef ENABLE_DEVICE_MAPPER
++                        (
++                         dev->type == PED_DEVICE_DM
++                         ? dm_canonical_path (dev) :
++#endif /* ENABLE_DEVICE_MAPPER */
++						 dev->path
++#ifdef ENABLE_DEVICE_MAPPER
++                        )
++#endif /* ENABLE_DEVICE_MAPPER */
++                        ;
+         size_t path_len = strlen (devpath);
+         char *result;
+         /* Check for devfs-style /disc => /partN transformation
+@@ -2945,12 +2956,14 @@
+                                                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 /* ENABLE_DEVICE_MAPPER */
+                 add_partition = _blkpg_add_partition;
+                 remove_partition = _blkpg_remove_partition;
+ #ifdef BLKPG_RESIZE_PARTITION
+@@ -2959,7 +2972,9 @@
+                 resize_partition = NULL;
+ #endif
+                 get_partition_start_and_length = _kernel_get_partition_start_and_length;
++#ifdef ENABLE_DEVICE_MAPPER
+         }
++#endif /* ENABLE_DEVICE_MAPPER */
+ 
+         /* lpn = largest partition number.
+          * for remove pass, use greater of device or label limit */