summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-06-07 18:53:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-08 16:01:41 +0100
commit939a61c5dcaff3e56cec1dcda01d27ca57154f78 (patch)
treef6c667059bde8c9c087b36d6e7ea54bf78dd5bd8
parente7260e7c86fcdb26358da9ec35cb5753771e54b2 (diff)
downloadpoky-939a61c5dcaff3e56cec1dcda01d27ca57154f78.tar.gz
parted: swap patches for the commits that landed upstream
Several of the parted fixes are actually upstream in slightly different form. (From OE-Core rev: 90e032a4dc8e7d56db667d35a15cbf30b9fcdf06) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch34
-rw-r--r--meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch44
-rw-r--r--meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch28
-rw-r--r--meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch76
-rw-r--r--meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch32
-rw-r--r--meta/recipes-extended/parted/parted_3.2.bb2
6 files changed, 119 insertions, 97 deletions
diff --git a/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch b/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
index b0376cefcf..4070127d34 100644
--- a/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
+++ b/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
@@ -1,29 +1,33 @@
1From d78dd087c4ec4715aab5fe115668e726046ecd76 Mon Sep 17 00:00:00 2001 1Upstream-Status: Backport
2From: Khem Raj <raj.khem@gmail.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3Date: Mon, 13 Apr 2015 18:16:05 -0700
4Subject: [PATCH] Include fcntl.h in /platform_defs.h
5 3
6exposed when compiling using musl 4From a3877115f1956949096d77aca5a703a47ed68397 Mon Sep 17 00:00:00 2001
5From: Felix Janda <felix.janda@posteo.de>
6Date: Sun, 3 May 2015 10:33:31 +0200
7Subject: [PATCH] libparted/fs/xfs/platform_defs.h: Include <fcntl.h> for
8 loff_t
7 9
8Upstream-Status: Pending 10This is needed for compilation with musl libc
9 11
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Suggested-by: Travis Tilley <ttilley@gmail.com>
13
14Signed-off-by: Brian C. Lane <bcl@redhat.com>
11--- 15---
12 libparted/fs/xfs/platform_defs.h | 1 + 16 libparted/fs/xfs/platform_defs.h | 1 +
13 1 file changed, 1 insertion(+) 17 1 file changed, 1 insertion(+)
14 18
15diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h 19diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h
16index 2b55752..32bd3d3 100644 20index 2b55752..a6ec8fb 100644
17--- a/libparted/fs/xfs/platform_defs.h 21--- a/libparted/fs/xfs/platform_defs.h
18+++ b/libparted/fs/xfs/platform_defs.h 22+++ b/libparted/fs/xfs/platform_defs.h
19@@ -42,6 +42,7 @@ 23@@ -38,6 +38,7 @@
24 #include <stdarg.h>
25 #include <assert.h>
26 #include <endian.h>
27+#include <fcntl.h>
28 #include <stddef.h>
20 #include <stdlib.h> 29 #include <stdlib.h>
21 #include <string.h> 30 #include <string.h>
22 #include <unistd.h>
23+#include <fcntl.h>
24 #include <sys/param.h>
25 #include <sys/types.h>
26
27-- 31--
282.1.4 322.11.0
29 33
diff --git a/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch b/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch
index e522e1c6ef..39107620d5 100644
--- a/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch
+++ b/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch
@@ -1,7 +1,8 @@
1From d6e15a60e84c1511523aa81272b7db7a6ec441d0 Mon Sep 17 00:00:00 2001 1From 843225aa9d5077bebdb08bbf9699c02aec0b83eb Mon Sep 17 00:00:00 2001
2From: Ovidiu Panait <ovidiu.panait@windriver.com> 2From: "Brian C. Lane" <bcl@redhat.com>
3Date: Tue, 26 Sep 2017 08:04:58 +0000 3Date: Tue, 26 Sep 2017 08:04:58 +0000
4Subject: [PATCH] libparted: Use read only when probing devices on linux 4Subject: [PATCH] libparted: Use read only when probing devices on linux
5
5 (#1245144) 6 (#1245144)
6 7
7When a device is opened for RW closing it can trigger other actions, 8When a device is opened for RW closing it can trigger other actions,
@@ -25,17 +26,17 @@ Resolves: rhbz#1245144
25 26
26Upstream-Status: Backport 27Upstream-Status: Backport
27 28
28Author: Brian C. Lane <bcl@redhat.com>
29Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> 29Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
30
30--- 31---
31 libparted/arch/linux.c | 62 +++++++++++++++++++++++++++++++++++--------------- 32 libparted/arch/linux.c | 62 +++++++++++++++++++++++++++++++++++---------------
32 1 file changed, 44 insertions(+), 18 deletions(-) 33 1 file changed, 44 insertions(+), 18 deletions(-)
33 34
34diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c 35diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
35index f612617..0a06a54 100644 36index 7f12f58..4ddea58 100644
36--- a/libparted/arch/linux.c 37--- a/libparted/arch/linux.c
37+++ b/libparted/arch/linux.c 38+++ b/libparted/arch/linux.c
38@@ -294,7 +294,9 @@ struct blkdev_ioctl_param { 39@@ -292,7 +292,9 @@ struct blkdev_ioctl_param {
39 static char* _device_get_part_path (PedDevice const *dev, int num); 40 static char* _device_get_part_path (PedDevice const *dev, int num);
40 static int _partition_is_mounted_by_path (const char* path); 41 static int _partition_is_mounted_by_path (const char* path);
41 static unsigned int _device_get_partition_range(PedDevice const* dev); 42 static unsigned int _device_get_partition_range(PedDevice const* dev);
@@ -46,7 +47,7 @@ index f612617..0a06a54 100644
46 47
47 static int 48 static int
48 _read_fd (int fd, char **buf) 49 _read_fd (int fd, char **buf)
49@@ -913,7 +915,7 @@ init_ide (PedDevice* dev) 50@@ -911,7 +913,7 @@ init_ide (PedDevice* dev)
50 if (!_device_stat (dev, &dev_stat)) 51 if (!_device_stat (dev, &dev_stat))
51 goto error; 52 goto error;
52 53
@@ -55,7 +56,7 @@ index f612617..0a06a54 100644
55 goto error; 56 goto error;
56 57
57 if (ioctl (arch_specific->fd, HDIO_GET_IDENTITY, &hdi)) { 58 if (ioctl (arch_specific->fd, HDIO_GET_IDENTITY, &hdi)) {
58@@ -982,11 +984,11 @@ init_ide (PedDevice* dev) 59@@ -980,11 +982,11 @@ init_ide (PedDevice* dev)
59 if (!_device_probe_geometry (dev)) 60 if (!_device_probe_geometry (dev))
60 goto error_close_dev; 61 goto error_close_dev;
61 62
@@ -69,7 +70,7 @@ index f612617..0a06a54 100644
69 error: 70 error:
70 return 0; 71 return 0;
71 } 72 }
72@@ -1119,7 +1121,7 @@ init_scsi (PedDevice* dev) 73@@ -1117,7 +1119,7 @@ init_scsi (PedDevice* dev)
73 char* vendor; 74 char* vendor;
74 char* product; 75 char* product;
75 76
@@ -78,7 +79,7 @@ index f612617..0a06a54 100644
78 goto error; 79 goto error;
79 80
80 if (ioctl (arch_specific->fd, SCSI_IOCTL_GET_IDLUN, &idlun) < 0) { 81 if (ioctl (arch_specific->fd, SCSI_IOCTL_GET_IDLUN, &idlun) < 0) {
81@@ -1133,7 +1135,7 @@ init_scsi (PedDevice* dev) 82@@ -1131,7 +1133,7 @@ init_scsi (PedDevice* dev)
82 goto error_close_dev; 83 goto error_close_dev;
83 if (!_device_probe_geometry (dev)) 84 if (!_device_probe_geometry (dev))
84 goto error_close_dev; 85 goto error_close_dev;
@@ -87,7 +88,7 @@ index f612617..0a06a54 100644
87 return 1; 88 return 1;
88 } 89 }
89 90
90@@ -1155,11 +1157,11 @@ init_scsi (PedDevice* dev) 91@@ -1153,11 +1155,11 @@ init_scsi (PedDevice* dev)
91 if (!_device_probe_geometry (dev)) 92 if (!_device_probe_geometry (dev))
92 goto error_close_dev; 93 goto error_close_dev;
93 94
@@ -101,7 +102,7 @@ index f612617..0a06a54 100644
101 error: 102 error:
102 return 0; 103 return 0;
103 } 104 }
104@@ -1171,7 +1173,7 @@ init_file (PedDevice* dev) 105@@ -1169,7 +1171,7 @@ init_file (PedDevice* dev)
105 106
106 if (!_device_stat (dev, &dev_stat)) 107 if (!_device_stat (dev, &dev_stat))
107 goto error; 108 goto error;
@@ -110,7 +111,7 @@ index f612617..0a06a54 100644
110 goto error; 111 goto error;
111 112
112 dev->sector_size = PED_SECTOR_SIZE_DEFAULT; 113 dev->sector_size = PED_SECTOR_SIZE_DEFAULT;
113@@ -1198,7 +1200,7 @@ init_file (PedDevice* dev) 114@@ -1196,7 +1198,7 @@ init_file (PedDevice* dev)
114 goto error_close_dev; 115 goto error_close_dev;
115 } 116 }
116 117
@@ -119,7 +120,7 @@ index f612617..0a06a54 100644
119 120
120 dev->bios_geom.cylinders = dev->length / 4 / 32; 121 dev->bios_geom.cylinders = dev->length / 4 / 32;
121 dev->bios_geom.heads = 4; 122 dev->bios_geom.heads = 4;
122@@ -1209,7 +1211,7 @@ init_file (PedDevice* dev) 123@@ -1207,7 +1209,7 @@ init_file (PedDevice* dev)
123 return 1; 124 return 1;
124 125
125 error_close_dev: 126 error_close_dev:
@@ -128,7 +129,7 @@ index f612617..0a06a54 100644
128 error: 129 error:
129 return 0; 130 return 0;
130 } 131 }
131@@ -1225,7 +1227,7 @@ init_dasd (PedDevice* dev, const char* model_name) 132@@ -1223,7 +1225,7 @@ init_dasd (PedDevice* dev, const char* model_name)
132 if (!_device_stat (dev, &dev_stat)) 133 if (!_device_stat (dev, &dev_stat))
133 goto error; 134 goto error;
134 135
@@ -137,7 +138,7 @@ index f612617..0a06a54 100644
137 goto error; 138 goto error;
138 139
139 LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev); 140 LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev);
140@@ -1265,11 +1267,11 @@ init_dasd (PedDevice* dev, const char* model_name) 141@@ -1263,11 +1265,11 @@ init_dasd (PedDevice* dev, const char* model_name)
141 142
142 dev->model = strdup (model_name); 143 dev->model = strdup (model_name);
143 144
@@ -151,7 +152,7 @@ index f612617..0a06a54 100644
151 error: 152 error:
152 return 0; 153 return 0;
153 } 154 }
154@@ -1284,7 +1286,7 @@ init_generic (PedDevice* dev, const char* model_name) 155@@ -1282,7 +1284,7 @@ init_generic (PedDevice* dev, const char* model_name)
155 if (!_device_stat (dev, &dev_stat)) 156 if (!_device_stat (dev, &dev_stat))
156 goto error; 157 goto error;
157 158
@@ -160,7 +161,7 @@ index f612617..0a06a54 100644
160 goto error; 161 goto error;
161 162
162 ped_exception_fetch_all (); 163 ped_exception_fetch_all ();
163@@ -1332,11 +1334,11 @@ init_generic (PedDevice* dev, const char* model_name) 164@@ -1330,11 +1332,11 @@ init_generic (PedDevice* dev, const char* model_name)
164 165
165 dev->model = strdup (model_name); 166 dev->model = strdup (model_name);
166 167
@@ -174,7 +175,7 @@ index f612617..0a06a54 100644
174 error: 175 error:
175 return 0; 176 return 0;
176 } 177 }
177@@ -1623,12 +1625,27 @@ retry: 178@@ -1621,12 +1623,27 @@ retry:
178 } 179 }
179 180
180 static int 181 static int
@@ -203,7 +204,7 @@ index f612617..0a06a54 100644
203 204
204 if (arch_specific->fd == -1) { 205 if (arch_specific->fd == -1) {
205 char* rw_error_msg = strerror (errno); 206 char* rw_error_msg = strerror (errno);
206@@ -1697,6 +1714,15 @@ linux_refresh_close (PedDevice* dev) 207@@ -1695,6 +1712,15 @@ linux_refresh_close (PedDevice* dev)
207 return 1; 208 return 1;
208 } 209 }
209 210
@@ -218,7 +219,4 @@ index f612617..0a06a54 100644
218+ 219+
219 #if SIZEOF_OFF_T < 8 220 #if SIZEOF_OFF_T < 8
220 221
221 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 222 static _syscall5(int,_llseek,
222--
2232.11.0
224
diff --git a/meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch b/meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch
new file mode 100644
index 0000000000..01262e5452
--- /dev/null
+++ b/meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch
@@ -0,0 +1,28 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 0b72b8eb41438b62eeb9e3548b0b8f3094a78681 Mon Sep 17 00:00:00 2001
5From: "Richard W.M. Jones" <rjones@redhat.com>
6Date: Sat, 24 Mar 2018 17:37:02 +0000
7Subject: [PATCH] linux: Include <sys/sysmacros.h> for major() macro.
8
9Since glibc 2.27 this header is required.
10---
11 libparted/arch/linux.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
15index 0f18904..a15854f 100644
16--- a/libparted/arch/linux.c
17+++ b/libparted/arch/linux.c
18@@ -41,6 +41,7 @@
19 #include <sys/utsname.h> /* for uname() */
20 #include <scsi/scsi.h>
21 #include <assert.h>
22+#include <sys/sysmacros.h>
23 #ifdef ENABLE_DEVICE_MAPPER
24 #include <libdevmapper.h>
25 #endif
26--
272.11.0
28
diff --git a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
index 68ab715f32..8c4d2ae66d 100644
--- a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
+++ b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
@@ -1,44 +1,68 @@
1From 060e74354774d36d2c11ef08e3e7ea9b9b6e23fb Mon Sep 17 00:00:00 2001 1Upstream-Status: Backport
2From: Hongxu Jia <hongxu.jia@windriver.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3Date: Thu, 13 Nov 2014 11:29:33 +0800
4Subject: [PATCH] libparted/arch/linux.c: fix compile failure while
5 --disable-device-mapper
6 3
7While --disable-device-mapper, the MACRO ENABLE_DEVICE_MAPPER is 4From da3f129710929abe9a403901fa7d168355b0e95a Mon Sep 17 00:00:00 2001
8undef, but it missed to scope some device mapper functions. 5From: Felix Janda <felix.janda@posteo.de>
6Date: Sun, 3 May 2015 10:33:15 +0200
7Subject: [PATCH] libparted/arch/linux.c: Compile without ENABLE_DEVICE_MAPPER
9 8
10Upstream-Status: Pending 9Signed-off-by: Brian C. Lane <bcl@redhat.com>
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13--- 10---
14 libparted/arch/linux.c | 8 ++++++-- 11 libparted/arch/linux.c | 21 +++++++++++++++++----
15 1 file changed, 6 insertions(+), 2 deletions(-) 12 1 file changed, 17 insertions(+), 4 deletions(-)
16 13
17diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c 14diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
18index 6fd73c5..2afa479 100644 15index a15854f..7f12f58 100644
19--- a/libparted/arch/linux.c 16--- a/libparted/arch/linux.c
20+++ b/libparted/arch/linux.c 17+++ b/libparted/arch/linux.c
21@@ -2320,6 +2320,7 @@ zasprintf (const char *format, ...) 18@@ -2305,6 +2305,7 @@ zasprintf (const char *format, ...)
19 return r < 0 ? NULL : resultp;
20 }
21
22+#ifdef ENABLE_DEVICE_MAPPER
22 static char * 23 static char *
23 dm_canonical_path (PedDevice const *dev) 24 dm_canonical_path (PedDevice const *dev)
24 { 25 {
25+#ifdef ENABLE_DEVICE_MAPPER 26@@ -2327,14 +2328,21 @@ dm_canonical_path (PedDevice const *dev)
26 LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev);
27
28 /* Get map name from devicemapper */
29@@ -2337,6 +2338,7 @@ dm_canonical_path (PedDevice const *dev)
30 dm_task_destroy (task);
31 return dev_name;
32 err: 27 err:
33+#endif
34 return NULL; 28 return NULL;
35 } 29 }
30+#endif
31
32 static char*
33 _device_get_part_path (PedDevice const *dev, int num)
34 {
35- char *devpath = (dev->type == PED_DEVICE_DM
36- ? dm_canonical_path (dev) : dev->path);
37- size_t path_len = strlen (devpath);
38+ char *devpath;
39+ size_t path_len;
40 char *result;
41+#ifdef ENABLE_DEVICE_MAPPER
42+ devpath = (dev->type == PED_DEVICE_DM
43+ ? dm_canonical_path (dev) : dev->path);
44+#else
45+ devpath = dev->path;
46+#endif
47+ path_len = strlen (devpath);
48 /* Check for devfs-style /disc => /partN transformation
49 unconditionally; the system might be using udev with devfs rules,
50 and if not the test is harmless. */
51@@ -2350,8 +2358,10 @@ _device_get_part_path (PedDevice const *dev, int num)
52 ? "p" : "");
53 result = zasprintf ("%s%s%d", devpath, p, num);
54 }
55+#ifdef ENABLE_DEVICE_MAPPER
56 if (dev->type == PED_DEVICE_DM)
57 free (devpath);
58+#endif
59 return result;
60 }
36 61
37@@ -2957,13 +2959,15 @@ _disk_sync_part_table (PedDisk* disk) 62@@ -2946,12 +2956,15 @@ _disk_sync_part_table (PedDisk* disk)
38 unsigned long long *start,
39 unsigned long long *length); 63 unsigned long long *length);
40 64
41- 65
42+#ifdef ENABLE_DEVICE_MAPPER 66+#ifdef ENABLE_DEVICE_MAPPER
43 if (disk->dev->type == PED_DEVICE_DM) { 67 if (disk->dev->type == PED_DEVICE_DM) {
44 add_partition = _dm_add_partition; 68 add_partition = _dm_add_partition;
@@ -53,5 +77,5 @@ index 6fd73c5..2afa479 100644
53 remove_partition = _blkpg_remove_partition; 77 remove_partition = _blkpg_remove_partition;
54 #ifdef BLKPG_RESIZE_PARTITION 78 #ifdef BLKPG_RESIZE_PARTITION
55-- 79--
561.9.1 802.11.0
57 81
diff --git a/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch b/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch
deleted file mode 100644
index 211e6c7340..0000000000
--- a/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1https://bugs.gentoo.org/580022
2
3From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
4From: Mike Frysinger <vapier@gentoo.org>
5Date: Tue, 21 Jun 2016 15:01:08 -0400
6Subject: [PATCH] include sysmacros.h for major/minor/makedev
7
8Linux C libs are moving away from including this header implicitly via
9sys/types.h, so include it explicitly.
10
11Upstream-Status: Pending
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13
14---
15 libparted/arch/linux.c | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
19index 326b95619d31..e5c168be3c68 100644
20--- a/libparted/arch/linux.c
21+++ b/libparted/arch/linux.c
22@@ -37,6 +37,7 @@
23 #include <dirent.h>
24 #include <sys/ioctl.h>
25 #include <sys/stat.h>
26+#include <sys/sysmacros.h>
27 #include <sys/types.h>
28 #include <sys/utsname.h> /* for uname() */
29 #include <scsi/scsi.h>
30--
312.8.2
32
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb
index ceac52892d..63f9f204e7 100644
--- a/meta/recipes-extended/parted/parted_3.2.bb
+++ b/meta/recipes-extended/parted/parted_3.2.bb
@@ -15,7 +15,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
15 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 15 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
16 file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ 16 file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \
17 file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \ 17 file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \
18 file://parted-3.2-sysmacros.patch \ 18 file://0001-linux-Include-sys-sysmacros.h-for-major-macro.patch \
19 file://run-ptest \ 19 file://run-ptest \
20 file://Makefile \ 20 file://Makefile \
21 file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \ 21 file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \