wok-6.x rev 17545
Up parted (3.2)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Jan 27 17:35:53 2015 +0100 (2015-01-27) |
parents | 36b17616c07e |
children | 6f704cecf2c4 |
files | parted-dev/receipt parted/receipt parted/stuff/device_mapper.u |
line diff
1.1 --- a/parted-dev/receipt Tue Jan 27 17:17:16 2015 +0100 1.2 +++ b/parted-dev/receipt Tue Jan 27 17:35:53 2015 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="parted-dev" 1.7 -VERSION="3.1" 1.8 +VERSION="3.2" 1.9 CATEGORY="development" 1.10 SHORT_DESC="GNU parted editor devel files." 1.11 MAINTAINER="pankso@slitaz.org"
2.1 --- a/parted/receipt Tue Jan 27 17:17:16 2015 +0100 2.2 +++ b/parted/receipt Tue Jan 27 17:35:53 2015 +0100 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="parted" 2.7 -VERSION="3.1" 2.8 +VERSION="3.2" 2.9 CATEGORY="system-tools" 2.10 SHORT_DESC="GNU parted partition editor." 2.11 MAINTAINER="pankso@slitaz.org" 2.12 @@ -17,6 +17,7 @@ 2.13 # Rules to configure and make the package. 2.14 compile_rules() 2.15 { 2.16 + patch -p1 < $stuff/device_mapper.u 2.17 grep -qs 'define u8' libparted/arch/linux.c || 2.18 sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 2.19 libparted/arch/linux.c
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/parted/stuff/device_mapper.u Tue Jan 27 17:35:53 2015 +0100 3.3 @@ -0,0 +1,44 @@ 3.4 +--- parted-3.2/libparted/arch/linux.c.device-mapper 2014-06-15 20:15:54.000000000 +0100 3.5 ++++ parted-3.2/libparted/arch/linux.c 2014-07-29 22:27:54.487430030 +0100 3.6 +@@ -2307,6 +2307,7 @@ zasprintf (const char *format, ...) 3.7 + static char * 3.8 + dm_canonical_path (PedDevice const *dev) 3.9 + { 3.10 ++#ifdef ENABLE_DEVICE_MAPPER 3.11 + LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev); 3.12 + 3.13 + /* Get map name from devicemapper */ 3.14 +@@ -2324,6 +2325,7 @@ dm_canonical_path (PedDevice const *dev) 3.15 + dm_task_destroy (task); 3.16 + return dev_name; 3.17 + err: 3.18 ++#endif 3.19 + return NULL; 3.20 + } 3.21 + 3.22 +@@ -2944,13 +2946,14 @@ _disk_sync_part_table (PedDisk* disk) 3.23 + unsigned long long *start, 3.24 + unsigned long long *length); 3.25 + 3.26 +- 3.27 ++#ifdef ENABLE_DEVICE_MAPPER 3.28 + if (disk->dev->type == PED_DEVICE_DM) { 3.29 + add_partition = _dm_add_partition; 3.30 + remove_partition = _dm_remove_partition; 3.31 + resize_partition = _dm_resize_partition; 3.32 + get_partition_start_and_length = _dm_get_partition_start_and_length; 3.33 + } else { 3.34 ++#endif 3.35 + add_partition = _blkpg_add_partition; 3.36 + remove_partition = _blkpg_remove_partition; 3.37 + #ifdef BLKPG_RESIZE_PARTITION 3.38 +@@ -2959,7 +2962,9 @@ _disk_sync_part_table (PedDisk* disk) 3.39 + resize_partition = NULL; 3.40 + #endif 3.41 + get_partition_start_and_length = _kernel_get_partition_start_and_length; 3.42 ++#ifdef ENABLE_DEVICE_MAPPER 3.43 + } 3.44 ++#endif 3.45 + 3.46 + /* lpn = largest partition number. 3.47 + * for remove pass, use greater of device or label limit */