Attachment #399390 for bug #544032

View | Details | Raw Unified | Return to bug 544032
Collapse All | Expand All

Line 0 Link Here

(-)a/sys-block/parted/Manifest (+5 lines)
	1	AUX parted-3.2-devmapper.patch 1972 SHA256 a72db7a487b891b19e6b859a6deaa4defe0c603842f1a91962de553e68acc96f SHA512 3baf2090ba86242df1633bb4b50deeb6e0226b0a56ad82466ddd76f028a859e29bd021f1f251047cd2a2a5ea1c77ed0129eca8be2e97ee48c21c1d186c07b8da WHIRLPOOL c0a16dce6f967b6d4d343bec9fe34c0803fdb231aa51abede4b94080db90af8be36d232f9d24246808a59be13be7635b520b0ec6c2cd82a99515c2ad0866f876
	2	AUX parted-3.2-fix-includes.patch 257 SHA256 f87c9290e861b969f4520a1af84ebf4b8f5f1437c1d78ee235d5ffcda3bffe84 SHA512 55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd WHIRLPOOL cbc2d36e9e0d59f032f4cd7e3a487674a17b8e87a873dea796dfadda7219526ad052b5826a9a353c0ed6d387b8f8c0ed9420394c8037f85c5deec08b292a158c
	3	AUX parted-3.2-po4a-mandir.patch 275 SHA256 327ffc2ea942a58a63cf6dc21d041965ee76b3b7d4d01b36a0654dcb6b0a92ae SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 WHIRLPOOL 643013b78ebd6dbd93a60e7fc46215851bcd9d3166f0df308fa9d1a3927772cf1d63d2ba0da737983b3fbb0ff125f946d27662808e6233f6c60bdf4f7425898d
	4	DIST parted-3.2.tar.xz 1655244 SHA256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 WHIRLPOOL af928177b893150ac6d5e0efcef542b6fa0df6b135f975078f7d8d5f7a4b109ef4c1f8eeaf6afc5c34448ff662ce4cbe5289e084f4ec05257666503a0cd3c93f
	5	EBUILD parted-3.2.ebuild 1467 SHA256 1bb5e9f92b25efd5d0e8146fe0b9d5c6d35823d1a5f9d6f744e99f1648dc6332 SHA512 1b82b428071acf82512aa4e55d132d6a05e960bcec038bb6ce5d9a9bde1186dfdf406d1a0ac68ead2803e62c9a4da51620a49f6c186f65867eeea6fa6d5099d4 WHIRLPOOL e4b8491c074512aa860a444b91af6e6d4bed9c38abfd39986fded76938ea6a413287d5f1b3de90402915384b89b4b9fb43176b66d925eacedb2fb671b81f83dc




--- 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 */

Line 0 Link Here

(-)a/sys-block/parted/files/parted-3.2-fix-includes.patch (+10 lines)
	1	--- parted-3.1.orig/libparted/fs/xfs/platform_defs.h
	2	+++ parted-3.1/libparted/fs/xfs/platform_defs.h
	3	@@ -35,6 +35,7 @@
	4	#define __XFS_PLATFORM_DEFS_H__
	5
	6	#include <stdio.h>
	7	+#include <fcntl.h>
	8	#include <stdarg.h>
	9	#include <assert.h>
	10	#include <endian.h>

Line 0 Link Here

(-)a/sys-block/parted/files/parted-3.2-po4a-mandir.patch (+11 lines)
	1	--- a/doc/po4a.mk
	2	+++ b/doc/po4a.mk
	3	@@ -23,7 +23,7 @@
	4	# threshold is 80%), it won't be distributed, and the build won't fail.
	5	#
	6
	7	-mandir = $(mandir)/$(lang)
	8	+mandir := $(mandir)/$(lang)
	9
	10	# Inform automake that we want to install some man pages in section 1, 5
	11	# and 8.




# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.14 2015/03/03 09:57:56 dlan Exp $

EAPI=5
inherit autotools eutils

DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
HOMEPAGE="http://www.gnu.org/software/parted"
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"

LICENSE="GPL-3"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="+debug device-mapper nls readline selinux static-libs"
RESTRICT="test"

# specific version for gettext needed
# to fix bug 85999
RDEPEND="
	>=sys-fs/e2fsprogs-1.27
	>=sys-libs/ncurses-5.7-r7
	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
	readline? ( >=sys-libs/readline-5.2 )
	selinux? ( sys-libs/libselinux )
"
DEPEND="
	${RDEPEND}
	nls? ( >=sys-devel/gettext-0.12.1-r2 )
	virtual/pkgconfig
"

src_prepare() {
	epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch
	epatch "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
	epatch "${FILESDIR}"/${PN}-3.2-fix-includes.patch
	eautoreconf
}

src_configure() {
	econf \
		$(use_enable debug) \
		$(use_enable device-mapper) \
		$(use_enable nls) \
		$(use_enable selinux) \
		$(use_enable static-libs static) \
		$(use_with readline) \
		--disable-rpath \
		--disable-silent-rules
}

DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )

src_install() {
	default
	prune_libtool_files
}

Return to bug 544032

Line 0 Link Here

(-)a/sys-block/parted/files/parted-3.2-devmapper.patch (+60 lines)
	1	--- a/libparted/arch/linux.c
	2	+++ b/libparted/arch/linux.c
	3	@@ -2304,6 +2304,7 @@
	4	return r < 0 ? NULL : resultp;
	5	}
	6
	7	+#ifdef ENABLE_DEVICE_MAPPER
	8	static char *
	9	dm_canonical_path (PedDevice const *dev)
	10	{
	11	@@ -2326,12 +2327,22 @@
	12	err:
	13	return NULL;
	14	}
	15	+#endif /* ENABLE_DEVICE_MAPPER */
	16
	17	static char*
	18	_device_get_part_path (PedDevice const *dev, int num)
	19	{
	20	- char *devpath = (dev->type == PED_DEVICE_DM
	21	- ? dm_canonical_path (dev) : dev->path);
	22	+ char *devpath =
	23	+#ifdef ENABLE_DEVICE_MAPPER
	24	+ (
	25	+ dev->type == PED_DEVICE_DM
	26	+ ? dm_canonical_path (dev) :
	27	+#endif /* ENABLE_DEVICE_MAPPER */
	28	+ dev->path
	29	+#ifdef ENABLE_DEVICE_MAPPER
	30	+ )
	31	+#endif /* ENABLE_DEVICE_MAPPER */
	32	+ ;
	33	size_t path_len = strlen (devpath);
	34	char *result;
	35	/* Check for devfs-style /disc => /partN transformation
	36	@@ -2945,12 +2956,14 @@
	37	unsigned long long *length);
	38
	39
	40	+#ifdef ENABLE_DEVICE_MAPPER
	41	if (disk->dev->type == PED_DEVICE_DM) {
	42	add_partition = _dm_add_partition;
	43	remove_partition = _dm_remove_partition;
	44	resize_partition = _dm_resize_partition;
	45	get_partition_start_and_length = _dm_get_partition_start_and_length;
	46	} else {
	47	+#endif /* ENABLE_DEVICE_MAPPER */
	48	add_partition = _blkpg_add_partition;
	49	remove_partition = _blkpg_remove_partition;
	50	#ifdef BLKPG_RESIZE_PARTITION
	51	@@ -2959,7 +2972,9 @@
	52	resize_partition = NULL;
	53	#endif
	54	get_partition_start_and_length = _kernel_get_partition_start_and_length;
	55	+#ifdef ENABLE_DEVICE_MAPPER
	56	}
	57	+#endif /* ENABLE_DEVICE_MAPPER */
	58
	59	/* lpn = largest partition number.
	60	* for remove pass, use greater of device or label limit */

Line 0 Link Here

(-)a/sys-block/parted/parted-3.2.ebuild (-1 / +57 lines)
0	-	1	# Copyright 1999-2015 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3	# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.14 2015/03/03 09:57:56 dlan Exp $
		4
		5	EAPI=5
		6	inherit autotools eutils
		7
		8	DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
		9	HOMEPAGE="http://www.gnu.org/software/parted"
		10	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
		11
		12	LICENSE="GPL-3"
		13	SLOT="0"
		14	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
		15	IUSE="+debug device-mapper nls readline selinux static-libs"
		16	RESTRICT="test"
		17
		18	# specific version for gettext needed
		19	# to fix bug 85999
		20	RDEPEND="
		21	>=sys-fs/e2fsprogs-1.27
		22	>=sys-libs/ncurses-5.7-r7
		23	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
		24	readline? ( >=sys-libs/readline-5.2 )
		25	selinux? ( sys-libs/libselinux )
		26	"
		27	DEPEND="
		28	${RDEPEND}
		29	nls? ( >=sys-devel/gettext-0.12.1-r2 )
		30	virtual/pkgconfig
		31	"
		32
		33	src_prepare() {
		34	epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch
		35	epatch "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
		36	epatch "${FILESDIR}"/${PN}-3.2-fix-includes.patch
		37	eautoreconf
		38	}
		39
		40	src_configure() {
		41	econf \
		42	$(use_enable debug) \
		43	$(use_enable device-mapper) \
		44	$(use_enable nls) \
		45	$(use_enable selinux) \
		46	$(use_enable static-libs static) \
		47	$(use_with readline) \
		48	--disable-rpath \
		49	--disable-silent-rules
		50	}
		51
		52	DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
		53
		54	src_install() {
		55	default
		56	prune_libtool_files
		57	}