From a102dd139046d315a3227a10efac9faf1c1d6b74 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 27 May 2006 22:09:02 +0000 Subject: [PATCH] - updated for 1.7.1 from FC Changed files: parted-iseries.patch -> 1.3 parted-sx8.patch -> 1.3 --- parted-iseries.patch | 76 +++++++++++++++++++++----------------------- parted-sx8.patch | 76 ++++++++++++++++++++++---------------------- 2 files changed, 75 insertions(+), 77 deletions(-) diff --git a/parted-iseries.patch b/parted-iseries.patch index a840958..d626931 100644 --- a/parted-iseries.patch +++ b/parted-iseries.patch @@ -1,43 +1,41 @@ ---- parted-1.6.3/libparted/linux.c.iseries 2003-05-16 17:50:31.000000000 -0400 -+++ parted-1.6.3/libparted/linux.c 2003-05-16 19:13:48.000000000 -0400 -@@ -223,6 +223,7 @@ - #define I2O_MAJOR8 87 +--- parted-1.7.0/include/parted/device.h.P150 2006-05-19 10:32:18.000000000 -0400 ++++ parted-1.7.0/include/parted/device.h 2006-05-19 11:01:23.000000000 -0400 +@@ -44,6 +44,7 @@ + PED_DEVICE_I2O = 7, + PED_DEVICE_UBD = 8, + PED_DEVICE_DASD = 9, ++ PED_DEVICE_VIODASD = 10, + PED_DEVICE_SX8 = 11 + } PedDeviceType; - #define DASD_MAJOR 94 -+#define VIODASD_MAJOR 112 +--- parted-1.7.0/libparted/arch/linux.c.P150 2006-05-19 10:54:51.000000000 -0400 ++++ parted-1.7.0/libparted/arch/linux.c 2006-05-19 11:02:45.000000000 -0400 +@@ -233,6 +233,7 @@ + #define I2O_MAJOR8 87 + #define UBD_MAJOR 98 + #define DASD_MAJOR 94 ++#define VIODASD_MAJOR 112 + #define SX8_MAJOR1 160 + #define SX8_MAJOR2 161 - #define SCSI_BLK_MAJOR(M) ( \ - (M) == SCSI_DISK0_MAJOR \ -@@ -313,6 +314,8 @@ - dev->type = PED_DEVICE_ATARAID; - } else if (dev_major == DASD_MAJOR && (dev_minor % 0x4 == 0)) { - dev->type = PED_DEVICE_DASD; -+ } else if (dev_major == VIODASD_MAJOR && (dev_minor % 0x8 == 0)) { -+ dev->type = PED_DEVICE_VIODASD; - } else if (_is_i2o_major (dev_major) && (dev_minor % 0x10 == 0)) { - dev->type = PED_DEVICE_I2O; - } else if (_is_cpqarray_major (dev_major) && (dev_minor % 0x10 == 0)) { -@@ -864,6 +867,11 @@ - goto error_free_arch_specific; - break; +@@ -331,6 +332,8 @@ + dev->type = PED_DEVICE_ATARAID; + } else if (dev_major == DASD_MAJOR && (dev_minor % 0x4 == 0)) { + dev->type = PED_DEVICE_DASD; ++ } else if (dev_major == VIODASD_MAJOR && (dev_minor % 0x8 == 0)) { ++ dev->type = PED_DEVICE_VIODASD; + } else if (_is_sx8_major(dev_major) && (dev_minor % 0x20 == 0)) { + dev->type = PED_DEVICE_SX8; + } else if (_is_i2o_major (dev_major) && (dev_minor % 0x10 == 0)) { +@@ -973,6 +976,11 @@ + goto error_free_arch_specific; + break; -+ case PED_DEVICE_VIODASD: -+ if (!init_generic (dev, _("IBM iSeries Virtual DASD"))) -+ goto error_free_arch_specific; -+ break; ++ case PED_DEVICE_VIODASD: ++ if (!init_generic (dev, _("IBM iSeries Virtual DASD"))) ++ goto error_free_arch_specific; ++ break; + - case PED_DEVICE_CPQARRAY: - if (!init_generic (dev, _("Compaq Smart Array"))) - goto error_free_arch_specific; ---- parted-1.6.25/include/parted/device.h.orig 2005-11-04 10:04:49.674223656 +0100 -+++ parted-1.6.25/include/parted/device.h 2005-11-04 10:05:25.462782968 +0100 -@@ -34,7 +34,8 @@ - PED_DEVICE_ATARAID = 6, - PED_DEVICE_I2O = 7, - PED_DEVICE_UBD = 8, -- PED_DEVICE_DASD = 9 -+ PED_DEVICE_DASD = 9, -+ PED_DEVICE_VIODASD = 10 - } PedDeviceType; - - typedef struct _PedDevice PedDevice; + case PED_DEVICE_CPQARRAY: + if (!init_generic (dev, _("Compaq Smart Array"))) + goto error_free_arch_specific; diff --git a/parted-sx8.patch b/parted-sx8.patch index eb49f53..1bcba01 100644 --- a/parted-sx8.patch +++ b/parted-sx8.patch @@ -1,57 +1,57 @@ ---- parted-1.6.25/include/parted/device.h.orig 2005-11-04 10:10:00.986896936 +0100 -+++ parted-1.6.25/include/parted/device.h 2005-11-04 10:09:55.245769720 +0100 -@@ -35,7 +35,8 @@ - PED_DEVICE_I2O = 7, - PED_DEVICE_UBD = 8, - PED_DEVICE_DASD = 9, -- PED_DEVICE_VIODASD = 10 -+ PED_DEVICE_VIODASD = 10, -+ PED_DEVICE_SX8 = 11 +--- parted-1.7.0/include/parted/device.h.P3 2006-05-15 05:19:17.000000000 -0400 ++++ parted-1.7.0/include/parted/device.h 2006-05-19 10:24:48.000000000 -0400 +@@ -42,7 +42,8 @@ + PED_DEVICE_FILE = 5, + PED_DEVICE_ATARAID = 6, + PED_DEVICE_I2O = 7, +- PED_DEVICE_UBD = 8 ++ PED_DEVICE_UBD = 8, ++ PED_DEVICE_SX8 = 11 } PedDeviceType; typedef struct _PedDevice PedDevice; ---- parted-1.6.25/libparted/linux.c.orig 2005-11-04 10:08:14.137140568 +0100 -+++ parted-1.6.25/libparted/linux.c 2005-11-04 10:11:53.906730512 +0100 -@@ -219,6 +219,8 @@ - #define I2O_MAJOR7 86 - #define I2O_MAJOR8 87 +--- parted-1.7.0/libparted/arch/linux.c.P3 2006-05-15 05:19:52.000000000 -0400 ++++ parted-1.7.0/libparted/arch/linux.c 2006-05-19 10:23:14.000000000 -0400 +@@ -229,6 +229,8 @@ + #define I2O_MAJOR7 86 + #define I2O_MAJOR8 87 #define UBD_MAJOR 98 +#define SX8_MAJOR1 160 +#define SX8_MAJOR2 161 - #define DASD_MAJOR 94 - #define VIODASD_MAJOR 112 -@@ -262,6 +264,12 @@ + #define SCSI_BLK_MAJOR(M) ( \ + (M) == SCSI_DISK0_MAJOR \ +@@ -269,6 +271,12 @@ } static int +_is_sx8_major (int major) +{ -+ return (SX8_MAJOR1 <= major && major <= SX8_MAJOR2); ++ return (SX8_MAJOR1 <= major && major <= SX8_MAJOR2); +} + +static int _device_stat (PedDevice* dev, struct stat * dev_stat) { - PED_ASSERT (dev != NULL, return 0); -@@ -314,6 +322,8 @@ - dev->type = PED_DEVICE_DASD; - } else if (dev_major == VIODASD_MAJOR && (dev_minor % 0x8 == 0)) { - dev->type = PED_DEVICE_VIODASD; -+ } else if (_is_sx8_major(dev_major) && (dev_minor % 0x20 == 0)) { -+ dev->type = PED_DEVICE_SX8; - } else if (_is_i2o_major (dev_major) && (dev_minor % 0x10 == 0)) { - dev->type = PED_DEVICE_I2O; - } else if (_is_cpqarray_major (dev_major) && (dev_minor % 0x10 == 0)) { -@@ -933,6 +943,11 @@ - goto error_free_arch_specific; - break; + PED_ASSERT (dev != NULL, return 0); +@@ -317,6 +325,8 @@ + dev->type = PED_DEVICE_DAC960; + } else if (dev_major == ATARAID_MAJOR && (dev_minor % 0x10 == 0)) { + dev->type = PED_DEVICE_ATARAID; ++ } else if (_is_sx8_major(dev_major) && (dev_minor % 0x20 == 0)) { ++ dev->type = PED_DEVICE_SX8; + } else if (_is_i2o_major (dev_major) && (dev_minor % 0x10 == 0)) { + dev->type = PED_DEVICE_I2O; + } else if (_is_cpqarray_major (dev_major) && (dev_minor % 0x10 == 0)) { +@@ -904,6 +914,11 @@ + goto error_free_arch_specific; + break; -+ case PED_DEVICE_SX8: -+ if (!init_generic (dev, _("Promise SX8 SATA Device"))) -+ goto error_free_arch_specific; -+ break; ++ case PED_DEVICE_SX8: ++ if (!init_generic (dev, _("Promise SX8 SATA Device"))) ++ goto error_free_arch_specific; ++ break; + - case PED_DEVICE_CPQARRAY: - if (!init_generic (dev, _("Compaq Smart Array"))) - goto error_free_arch_specific; + case PED_DEVICE_CPQARRAY: + if (!init_generic (dev, _("Compaq Smart Array"))) + goto error_free_arch_specific; -- 2.44.0