diff --git a/parted-1.9.0-dasd-533808.patch b/parted-1.9.0-dasd-533808.patch index cabe334..2a2a063 100644 --- a/parted-1.9.0-dasd-533808.patch +++ b/parted-1.9.0-dasd-533808.patch @@ -20,15 +20,14 @@ diff -up parted-1.9.0/libparted/arch/linux.c.dasd2 parted-1.9.0/libparted/arch/l if (!_device_stat (dev, &dev_stat)) goto error; -@@ -1115,15 +1118,18 @@ init_dasd (PedDevice* dev, const char* m +@@ -1115,15 +1118,17 @@ init_dasd (PedDevice* dev, const char* m dev->hw_geom = dev->bios_geom; } + if (!ioctl(arch_specific->fd, BIODASDINFO, &dasd_info)) { + arch_specific->devno = dasd_info.devno; + } else { -+ arch_specific->devno = arch_specific->major * 256 + -+ arch_specific->minor; ++ arch_specific->devno = -1; + } + dev->model = strdup (model_name); diff --git a/parted.spec b/parted.spec index 6488287..cb1a0f9 100644 --- a/parted.spec +++ b/parted.spec @@ -4,7 +4,7 @@ Summary: The GNU disk partition manipulation program Name: parted Version: 1.9.0 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv3+ Group: Applications/System URL: http://www.gnu.org/software/parted @@ -149,6 +149,9 @@ fi %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc %changelog +* Wed Nov 11 2009 Hans de Goede 1.9.0-23 +- Fix parted not building on s390 + * Mon Nov 9 2009 Hans de Goede 1.9.0-22 - Fix error when creating a fresh dasd disk on a dasd device with a corrupted dasd label (#533808)