From f51c98a81cef3a659cb4c078f91c0c74957630a4656ef08fade847b35a21d15b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 27 Jan 2010 16:34:38 +0000 Subject: [PATCH] checked in (request 30481) OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=15 --- parted.changes | 8 +------- parted.spec | 6 ------ retry-blkpg-ioctl.patch | 22 ---------------------- use-ext-range.patch | 22 ---------------------- 4 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 retry-blkpg-ioctl.patch delete mode 100644 use-ext-range.patch diff --git a/parted.changes b/parted.changes index 0a1587f..f8883ba 100644 --- a/parted.changes +++ b/parted.changes @@ -1,15 +1,9 @@ -------------------------------------------------------------------- -Mon Jan 25 15:54:17 UTC 2010 - puzel@novell.com - -- use-ext-range.patch (bnc#567652) - ------------------------------------------------------------------- Thu Dec 3 14:10:59 UTC 2009 - puzel@novell.com - avoid-unnecessary-open-close.patch, do-not-unnecessarily-open-part-dev.patch, - fix-race-call-udevadm-settle.patch, - retry-blkpg-ioctl.patch (bnc#539521) + fix-race-call-udevadm-settle.patch (bnc#539521) ------------------------------------------------------------------- Wed Oct 7 14:12:15 UTC 2009 - puzel@novell.com diff --git a/parted.spec b/parted.spec index 5229f47..4a8059f 100644 --- a/parted.spec +++ b/parted.spec @@ -60,10 +60,6 @@ Patch18: avoid-unnecessary-open-close.patch Patch19: do-not-unnecessarily-open-part-dev.patch #PATCH-FIX-UPSTREAM fix-race-call-udevadm-settle.patch bnc#539521 petr.uzel@suse.cz Patch20: fix-race-call-udevadm-settle.patch -#PATCH-FIX-UPSTREAM retry-blkpg-ioctl.patch bnc#539521 petr.uzel@suse.cz -Patch21: retry-blkpg-ioctl.patch -#PATCH-FIX-UPSTREAM use-ext-range.patch bnc#567652 petr.uzel@suse.cz -Patch22: use-ext-range.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gnu.org/software/parted/ PreReq: %install_info_prereq @@ -127,8 +123,6 @@ Authors: %patch18 -p1 %patch19 -p1 %patch20 -p1 -%patch21 -p1 -%patch22 -p1 %build AUTOPOINT=true autoreconf --force --install diff --git a/retry-blkpg-ioctl.patch b/retry-blkpg-ioctl.patch deleted file mode 100644 index c03debb..0000000 --- a/retry-blkpg-ioctl.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: parted-1.9.0/libparted/arch/linux.c -=================================================================== ---- parted-1.9.0.orig/libparted/arch/linux.c 2010-01-25 16:24:54.000000000 +0100 -+++ parted-1.9.0/libparted/arch/linux.c 2010-01-25 16:26:35.000000000 +0100 -@@ -2360,8 +2360,17 @@ _disk_sync_part_table (PedDisk* disk) - int i; - - for (i = 1; i <= lpn; i++) { -+ /* try to BLKPG_REMOVE the partition -+ * retry once more after short sleep if EBUSY -+ */ - rets[i - 1] = _blkpg_remove_partition (disk, i); - errnums[i - 1] = errno; -+ -+ if ( !rets[i - 1] && errnums[i - 1] == EBUSY ) { -+ sleep(1); -+ rets[i - 1] = _blkpg_remove_partition (disk, i); -+ errnums[i - 1] = errno; -+ } - } - - for (i = 1; i <= lpn; i++) { diff --git a/use-ext-range.patch b/use-ext-range.patch deleted file mode 100644 index a41d2e7..0000000 --- a/use-ext-range.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: parted-1.9.0/libparted/arch/linux.c -=================================================================== ---- parted-1.9.0.orig/libparted/arch/linux.c 2010-01-25 16:32:09.000000000 +0100 -+++ parted-1.9.0/libparted/arch/linux.c 2010-01-25 16:33:18.000000000 +0100 -@@ -2296,7 +2296,7 @@ _blkpg_remove_partition (PedDisk* disk, - - /* - * The number of partitions that a device can have depends on the kernel. -- * If we don't find this value in /sys/block/DEV/range, we will use our own -+ * If we don't find this value in /sys/block/DEV/ext_range, we will use our own - * value. - */ - static unsigned int -@@ -2307,7 +2307,7 @@ _device_get_partition_range(PedDevice* d - FILE* fp; - bool ok; - -- r = snprintf(path, sizeof(path), "/sys/block/%s/range", -+ r = snprintf(path, sizeof(path), "/sys/block/%s/ext_range", - last_component(dev->path)); - if(r < 0 || r >= sizeof(path)) - return MAX_NUM_PARTS;