From d2638b4319d451adedac2b913d19411da29adf65279e2d9094020c073339d638 Mon Sep 17 00:00:00 2001 From: Sebastian Parschauer Date: Tue, 15 Aug 2017 15:31:07 +0000 Subject: [PATCH] - Fix s390x --wipesignatures regression caused by fate#320525 (bsc#1047031) - amend: parted-implement-wipesignatures-option.patch - refresh: 0002-dasd-enhance-device-probing.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=131 --- 0002-dasd-enhance-device-probing.patch | 2 +- parted-implement-wipesignatures-option.patch | 47 +++++++++----------- parted.changes | 8 ++++ 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/0002-dasd-enhance-device-probing.patch b/0002-dasd-enhance-device-probing.patch index 2e1cb7c..f1c2a2d 100644 --- a/0002-dasd-enhance-device-probing.patch +++ b/0002-dasd-enhance-device-probing.patch @@ -141,7 +141,7 @@ Acked-by: Sebastian Parschauer +#elif USE_BLKID get_minimum_alignment: linux_get_minimum_alignment, get_optimum_alignment: linux_get_optimum_alignment, - wipe_signatures: linux_wipe_signatures, + #endif --- a/libparted/device.c +++ b/libparted/device.c @@ -550,16 +550,10 @@ ped_device_get_optimum_alignment(const P diff --git a/parted-implement-wipesignatures-option.patch b/parted-implement-wipesignatures-option.patch index 348f952..0354650 100644 --- a/parted-implement-wipesignatures-option.patch +++ b/parted-implement-wipesignatures-option.patch @@ -1,13 +1,14 @@ -From f5216170b98e0c28dfee717fb03b6a06bcc2a3ee Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Thu, 28 Apr 2016 17:18:44 +0200 Subject: [PATCH] parted: implement --wipesignatures option +References: bsc#943623, fate#319893, bsc#980834 +Patch-mainline: no, custom extension With this option, parted uses libblkid to wipe superblock signatures from a disk region where it is about to create a new partition. -References: bsc#943623 -References: fate#319893 +[sparschauer: Use own #if USE_BLKID block in linux_dev_ops (bsc#1047031)] +Signed-off-by: Sebastian Parschauer --- doc/C/parted.8 | 4 ++++ include/parted/device.in.h | 2 ++ @@ -16,10 +17,8 @@ References: fate#319893 parted/parted.c | 16 ++++++++++++++++ 5 files changed, 78 insertions(+) -Index: parted-3.2/doc/C/parted.8 -=================================================================== ---- parted-3.2.orig/doc/C/parted.8 -+++ parted-3.2/doc/C/parted.8 +--- a/doc/C/parted.8 ++++ b/doc/C/parted.8 @@ -30,6 +30,10 @@ never prompts for user intervention .B -v, --version displays the version @@ -31,10 +30,8 @@ Index: parted-3.2/doc/C/parted.8 .B -a \fIalignment-type\fP, --align \fIalignment-type\fP Set alignment for newly created partitions, valid alignment types are: .RS -Index: parted-3.2/include/parted/device.in.h -=================================================================== ---- parted-3.2.orig/include/parted/device.in.h -+++ parted-3.2/include/parted/device.in.h +--- a/include/parted/device.in.h ++++ b/include/parted/device.in.h @@ -119,6 +119,7 @@ struct _PedDeviceArchOps { /* These functions are optional */ PedAlignment *(*get_minimum_alignment)(const PedDevice *dev); @@ -51,11 +48,9 @@ Index: parted-3.2/include/parted/device.in.h /* private stuff ;-) */ -Index: parted-3.2/libparted/arch/linux.c -=================================================================== ---- parted-3.2.orig/libparted/arch/linux.c -+++ parted-3.2/libparted/arch/linux.c -@@ -3297,6 +3297,44 @@ linux_get_optimum_alignment(const PedDev +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -3298,6 +3298,44 @@ linux_get_optimum_alignment(const PedDev blkid_topology_get_alignment_offset(tp) / dev->sector_size, blkid_topology_get_optimal_io_size(tp) / dev->sector_size); } @@ -100,18 +95,18 @@ Index: parted-3.2/libparted/arch/linux.c #endif static PedDeviceArchOps linux_dev_ops = { -@@ -3316,6 +3354,7 @@ static PedDeviceArchOps linux_dev_ops = - #if USE_BLKID +@@ -3318,6 +3356,9 @@ static PedDeviceArchOps linux_dev_ops = get_minimum_alignment: linux_get_minimum_alignment, get_optimum_alignment: linux_get_optimum_alignment, -+ wipe_signatures: linux_wipe_signatures, #endif ++#if USE_BLKID ++ wipe_signatures: linux_wipe_signatures, ++#endif }; -Index: parted-3.2/libparted/device.c -=================================================================== ---- parted-3.2.orig/libparted/device.c -+++ parted-3.2/libparted/device.c + PedDiskArchOps linux_disk_ops = { +--- a/libparted/device.c ++++ b/libparted/device.c @@ -565,4 +565,21 @@ ped_device_get_optimum_alignment(const P return align; } @@ -134,10 +129,8 @@ Index: parted-3.2/libparted/device.c +} + /** @} */ -Index: parted-3.2/parted/parted.c -=================================================================== ---- parted-3.2.orig/parted/parted.c -+++ parted-3.2/parted/parted.c +--- a/parted/parted.c ++++ b/parted/parted.c @@ -76,6 +76,7 @@ static int MEGABYTE_SECTORS (PedDevice* enum { diff --git a/parted.changes b/parted.changes index 73d3846..d9c2e86 100644 --- a/parted.changes +++ b/parted.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 15 17:21:02 CEST 2017 - sparschauer@suse.de + +- Fix s390x --wipesignatures regression caused by fate#320525 + (bsc#1047031) + - amend: parted-implement-wipesignatures-option.patch + - refresh: 0002-dasd-enhance-device-probing.patch + ------------------------------------------------------------------- Fri Aug 11 16:15:08 CEST 2017 - sparschauer@suse.de