Browse Source

Merge "Relocate parted to stx-integ/filesystem/parted"

changes/73/600173/1
Zuul 9 months ago
parent
commit
627224770e

+ 0
- 1
centos_pkg_dirs View File

@@ -1,4 +1,3 @@
1
-parted
2 1
 python-keyring
3 2
 seabios
4 3
 grub2

+ 0
- 14
parted/PKG-INFO View File

@@ -1,14 +0,0 @@
1
-Metadata-Version: 1.1
2
-Name: parted
3
-Version: 2.0.21
4
-Summary: Disk partition editing/resizing utility
5
-Home-page: 
6
-Author:
7
-Author-email:
8
-License: GPLv3+
9
-
10
-Description:
11
-Disk partition editing/resizing utility
12
-
13
-        
14
-Platform: UNKNOWN

+ 0
- 3
parted/centos/build_srpm.data View File

@@ -1,3 +0,0 @@
1
-COPY_LIST="files/resizepart.sh"
2
-TIS_PATCH_VER=3
3
-BUILD_IS_SLOW=5

+ 0
- 24
parted/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch View File

@@ -1,25 +0,0 @@
1
-From 74ab16d7e0c23b933b3d6f42eac63d70d07ab62d Mon Sep 17 00:00:00 2001
2
-From: Don Penney <don.penney@windriver.com>
3
-Date: Tue, 27 Sep 2016 10:50:03 -0400
4
-Subject: [PATCH] Update package versioning for TIS format
5
-
6
----
7
- SPECS/parted.spec | 2 +-
8
- 1 file changed, 1 insertion(+), 1 deletion(-)
9
-
10
-diff --git a/SPECS/parted.spec b/SPECS/parted.spec
11
-index 644c2df..b79ca4a 100644
12
---- a/SPECS/parted.spec
13
-+++ b/SPECS/parted.spec
14
-@@ -4,7 +4,7 @@
15
- Summary: The GNU disk partition manipulation program
16
- Name:    parted
17
- Version: 3.1
18
--Release: 28%{?dist}
19
-+Release: 28.el7%{?_tis_dist}.%{tis_patch_ver}
20
- License: GPLv3+
21
- Group:   Applications/System
22
- URL:     http://www.gnu.org/software/parted
23
-1.8.3.1
24
-

+ 0
- 32
parted/centos/meta_patches/0003-fix-dev-nodes-getting-removed-for-100-to-300-ms-on-p.patch View File

@@ -1,33 +0,0 @@
1
-From cfa8f478bd19cf706f87c3c5a8baf54df7f2ea16 Mon Sep 17 00:00:00 2001
2
-From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
3
-Date: Fri, 2 Mar 2018 17:22:52 +0200
4
-Subject: [PATCH] 
5
- fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
6
-
7
----
8
- SPECS/parted.spec | 2 ++
9
- 1 file changed, 2 insertions(+)
10
-
11
-diff --git a/SPECS/parted.spec b/SPECS/parted.spec
12
-index 6979b14..06a09f8 100644
13
---- a/SPECS/parted.spec
14
-+++ b/SPECS/parted.spec
15
-@@ -15,6 +15,7 @@ Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
16
- Source1: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
17
- Source2: pubkey.jim.meyering
18
- Source3: resizepart.sh
19
-+Source4: fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
20
- 
21
- Patch0: parted-3.0-libparted-copy-pmbr_boot-when-duplicating-GPT-disk.patch
22
- Patch1: parted-3.1-libparted-check-PMBR-before-GPT-partition-table-8052.patch
23
-@@ -64,6 +65,7 @@ Patch42: 0042-tests-Set-optimal-blocks-to-64-for-scsi_debug-device.patch
24
- 
25
- # WRS
26
- Patch43: syscalls.patch
27
-+Patch44: fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
28
- 
29
- Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
30
- BuildRequires: e2fsprogs-devel
31
-1.9.1
32
-

+ 0
- 3
parted/centos/meta_patches/PATCH_ORDER View File

@@ -1,3 +0,0 @@
1
-syscalls.patch
2
-0001-Update-package-versioning-for-TIS-format.patch
3
-0003-fix-dev-nodes-getting-removed-for-100-to-300-ms-on-p.patch

+ 0
- 62
parted/centos/meta_patches/syscalls.patch View File

@@ -1,63 +0,0 @@
1
-From 4859fab94b298a4ca449216c3035b8b024c661a3 Mon Sep 17 00:00:00 2001
2
-From: Kristine Bujold <kristine.bujold@windriver.com>
3
-Date: Wed, 21 Dec 2016 15:28:53 -0500
4
-Subject: [PATCH 1/2] WRS: syscalls.patch
5
-
6
----
7
- SPECS/parted.spec | 12 +++++++++++-
8
- 1 file changed, 11 insertions(+), 1 deletion(-)
9
-
10
-diff --git a/SPECS/parted.spec b/SPECS/parted.spec
11
-index 749687f..644c2df 100644
12
---- a/SPECS/parted.spec
13
-+++ b/SPECS/parted.spec
14
-@@ -12,6 +12,7 @@ URL:     http://www.gnu.org/software/parted
15
- Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
16
- Source1: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
17
- Source2: pubkey.jim.meyering
18
-+Source3: resizepart.sh
19
- 
20
- Patch0: parted-3.0-libparted-copy-pmbr_boot-when-duplicating-GPT-disk.patch
21
- Patch1: parted-3.1-libparted-check-PMBR-before-GPT-partition-table-8052.patch
22
-@@ -59,6 +60,9 @@ Patch40: 0040-partprobe-Open-the-device-once-for-probing-1339705.patch
23
- Patch41: 0041-tests-Stop-timing-t9040-1172675.patch
24
- Patch42: 0042-tests-Set-optimal-blocks-to-64-for-scsi_debug-device.patch
25
- 
26
-+# WRS
27
-+Patch43: syscalls.patch
28
-+
29
- Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
30
- BuildRequires: e2fsprogs-devel
31
- BuildRequires: readline-devel
32
-@@ -121,7 +125,7 @@ git commit -a -m "run iconv"
33
- autoreconf
34
- autoconf
35
- CFLAGS="$RPM_OPT_FLAGS -Wno-unused-but-set-variable"; export CFLAGS
36
--%configure --enable-selinux --disable-static
37
-+%configure --enable-selinux --disable-static --disable-device-mapper
38
- # Don't use rpath!
39
- %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
40
- %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
41
-@@ -150,6 +154,9 @@ popd
42
- 
43
- %find_lang %{name}
44
- 
45
-+# WRS
46
-+install -d %{buildroot}%{_sbindir}
47
-+install -m 755 %{SOURCE3} %{buildroot}%{_sbindir}/resizepart.sh
48
- 
49
- %check
50
- export LD_LIBRARY_PATH=$(pwd)/libparted/.libs
51
-@@ -185,6 +192,9 @@ fi
52
- %{_libdir}/libparted-fs-resize.so*
53
- %{_infodir}/parted.info.gz
54
- 
55
-+# WRS
56
-+%{_sbindir}/resizepart.sh
57
-+
58
- %files devel
59
- %defattr(-,root,root,-)
60
- %{_includedir}/parted
61
-1.8.3.1
62
-

+ 0
- 1102
parted/centos/patches/fix-dev-nodes-getting-removed-for-100-to-300-ms-on-parted-print.patch
File diff suppressed because it is too large
View File


+ 0
- 42
parted/centos/patches/syscalls.patch View File

@@ -1,42 +0,0 @@
1
-From: "Allain Legacy" <allain.legacy@windriver.com>
2
----
3
-Index: parted-3.1/libparted/arch/linux.c
4
-===================================================================
5
---- parted-3.1.orig/libparted/arch/linux.c
6
-+++ parted-3.1/libparted/arch/linux.c
7
-@@ -1646,12 +1646,14 @@ _device_close (PedDevice* dev)
8
- 
9
- #if SIZEOF_OFF_T < 8
10
- 
11
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
12
- static _syscall5(int,_llseek,
13
-                  unsigned int, fd,
14
-                  unsigned long, offset_high,
15
-                  unsigned long, offset_low,
16
-                  loff_t*, result,
17
-                  unsigned int, origin)
18
-+#endif
19
- 
20
- loff_t
21
- llseek (unsigned int fd, loff_t offset, unsigned int whence)
22
-@@ -1659,11 +1661,20 @@ llseek (unsigned int fd, loff_t offset,
23
-         loff_t result;
24
-         int retval;
25
- 
26
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
27
-         retval = _llseek(fd,
28
-                          ((unsigned long long)offset) >> 32,
29
-                          ((unsigned long long)offset) & 0xffffffff,
30
-                          &result,
31
-                          whence);
32
-+#else
33
-+        retval = syscall(__NR__llseek, fd,
34
-+                         ((unsigned long long)offset) >> 32,
35
-+                         ((unsigned long long)offset) & 0xffffffff,
36
-+                         &result,
37
-+                         whence);
38
-+#endif
39
-+
40
-         return (retval==-1 ? (loff_t) retval : result);
41
- }
42
- 

+ 0
- 1
parted/centos/srpm_path View File

@@ -1 +0,0 @@
1
-mirror:Source/parted-3.1-28.el7.src.rpm

+ 0
- 285
parted/files/Makefile View File

@@ -1,285 +0,0 @@
1
-am__tty_colors_dummy = \
2
-  mgn= red= grn= lgn= blu= brg= std=; \
3
-  am__color_tests=no
4
-
5
-am__tty_colors = \
6
-$(am__tty_colors_dummy); \
7
-test "X$(AM_COLOR_TESTS)" != Xno \
8
-&& test "X$$TERM" != Xdumb \
9
-&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
10
-&& { \
11
-  am__color_tests=yes; \
12
-  red=''; \
13
-  grn=''; \
14
-  lgn=''; \
15
-  blu=''; \
16
-  mgn=''; \
17
-  brg=''; \
18
-  std=''; \
19
-}
20
-
21
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
22
-am__vpath_adj = case $$p in \
23
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
24
-    *) f=$$p;; \
25
-  esac;
26
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
27
-am__rst_section = { sed 'p;s/./=/g;' && echo; }
28
-am__sh_e_setup = case $$- in *e*) set +e;; esac
29
-
30
-am__common_driver_flags = \
31
-  --color-tests "$$am__color_tests" \
32
-  --enable-hard-errors "$$am__enable_hard_errors" \
33
-  --expect-failure "$$am__expect_failure"
34
-am__check_pre = \
35
-$(am__sh_e_setup);					\
36
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
37
-$(am__tty_colors);					\
38
-srcdir=$(srcdir); export srcdir;			\
39
-am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;		\
40
-test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;	\
41
-if test -f "./$$f"; then dir=./;			\
42
-elif test -f "$$f"; then dir=;				\
43
-else dir="$(srcdir)/"; fi;				\
44
-tst=$$dir$$f; log='$@'; 				\
45
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
46
-  am__enable_hard_errors=no; 				\
47
-else							\
48
-  am__enable_hard_errors=yes; 				\
49
-fi; 							\
50
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
51
-
52
-am__set_TESTS_bases = \
53
-  bases='$(TEST_LOGS)'; \
54
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
55
-  bases=`echo $$bases`
56
-
57
-RECHECK_LOGS = $(TEST_LOGS)
58
-TEST_SUITE_LOG = test-suite.log
59
-am__test_logs1 = $(TESTS:=.log)
60
-am__test_logs2 = $(am__test_logs1:.log=.log)
61
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
62
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
63
-SH_LOG_COMPILE = $(SH_LOG_COMPILER)
64
-
65
-am__set_b = \
66
-  case '$@' in \
67
-    */*) \
68
-      case '$*' in \
69
-        */*) b='$*';; \
70
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
71
-       esac;; \
72
-    *) \
73
-      b='$*';; \
74
-  esac
75
-
76
-MKDIR_P = /bin/mkdir -p
77
-SHELL = /bin/bash
78
-VERSION = 3.1
79
-PACKAGE_STRING = GNU parted 3.1
80
-PACKAGE_BUGREPORT = bug-parted@gnu.org
81
-abs_srcdir = $(PWD)
82
-abs_top_builddir = $(PWD)/..
83
-abs_top_srcdir = $(PWD)/..
84
-srcdir = .
85
-top_srcdir = ..
86
-subdir = tests
87
-SH_LOG_COMPILER = $(SHELL)
88
-
89
-TESTS = \
90
-  help-version.sh \
91
-  t0000-basic.sh \
92
-  t0001-tiny.sh \
93
-  t0010-script-no-ctrl-chars.sh \
94
-  t0100-print.sh \
95
-  t0101-print-empty.sh \
96
-  t0200-gpt.sh \
97
-  t0201-gpt.sh \
98
-  t0202-gpt-pmbr.sh \
99
-  t0203-gpt-tiny-device-abort.sh \
100
-  t0203-gpt-shortened-device-primary-valid.sh \
101
-  t0205-gpt-list-clobbers-pmbr.sh \
102
-  t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh \
103
-  t0207-IEC-binary-notation.sh \
104
-  t0208-mkpart-end-in-IEC.sh \
105
-  t0209-gpt-pmbr_boot.sh \
106
-  t0210-gpt-resized-partition-entry-array.sh \
107
-  t0211-gpt-rewrite-header.sh \
108
-  t0212-gpt-many-partitions.sh \
109
-  t0220-gpt-msftres.sh \
110
-  t0250-gpt.sh \
111
-  t0280-gpt-corrupt.sh \
112
-  t0300-dos-on-gpt.sh \
113
-  t0400-loop-clobber-infloop.sh \
114
-  t0500-dup-clobber.sh \
115
-  t0501-duplicate.sh \
116
-  t1100-busy-label.sh \
117
-  t1101-busy-partition.sh \
118
-  t1700-probe-fs.sh \
119
-  t2200-dos-label-recog.sh \
120
-  t2201-pc98-label-recog.sh \
121
-  t2300-dos-label-extended-bootcode.sh \
122
-  t2310-dos-extended-2-sector-min-offset.sh \
123
-  t2400-dos-hfs-partition-type.sh \
124
-  t2500-probe-corrupt-hfs.sh \
125
-  t3000-resize-fs.sh \
126
-  t3200-type-change.sh \
127
-  t3300-palo-prep.sh \
128
-  t3310-flags.sh \
129
-  t3400-whole-disk-FAT-partition.sh \
130
-  t4000-sun-raid-type.sh \
131
-  t4001-sun-vtoc.sh \
132
-  t4100-msdos-partition-limits.sh \
133
-  t4100-dvh-partition-limits.sh \
134
-  t4100-msdos-starting-sector.sh \
135
-  t4200-partprobe.sh \
136
-  t4300-nilfs2-tiny.sh \
137
-  t5000-tags.sh \
138
-  t6000-dm.sh \
139
-  t6001-psep.sh \
140
-  t6100-mdraid-partitions.sh \
141
-  t7000-scripting.sh \
142
-  t8000-loop.sh \
143
-  t8001-loop-blkpg.sh \
144
-  t9010-big-sector.sh \
145
-  t9020-alignment.sh \
146
-  t9021-maxima.sh \
147
-  t9022-one-unit-snap.sh \
148
-  t9023-value-lt-one.sh \
149
-  t9030-align-check.sh \
150
-  t9040-many-partitions.sh \
151
-  t9041-undetected-in-use-16th-partition.sh \
152
-  t9042-dos-partition-limit.sh \
153
-  t9050-partition-table-types.sh
154
-
155
-TESTS_ENVIRONMENT = \
156
-  export					\
157
-  abs_top_builddir='$(abs_top_builddir)'	\
158
-  abs_top_srcdir='$(abs_top_srcdir)'		\
159
-  abs_srcdir='$(abs_srcdir)'			\
160
-  built_programs=parted				\
161
-  srcdir='$(srcdir)'				\
162
-  top_srcdir='$(top_srcdir)'			\
163
-  VERSION=$(VERSION)				\
164
-  ; 9>&2
165
-
166
-.SUFFIXES: .log
167
-
168
-$(TEST_SUITE_LOG): $(TEST_LOGS)
169
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
170
-	ws='[ 	]'; \
171
-	results=`for b in $$bases; do echo $$b.trs; done`; \
172
-	test -n "$$results" || results=/dev/null; \
173
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
174
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
175
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
176
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
177
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
178
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
179
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
180
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
181
-	  success=true; \
182
-	else \
183
-	  success=false; \
184
-	fi; \
185
-	br='==================='; br=$$br$$br$$br$$br; \
186
-	result_count () \
187
-	{ \
188
-	    if test x"$$1" = x"--maybe-color"; then \
189
-	      maybe_colorize=yes; \
190
-	    elif test x"$$1" = x"--no-color"; then \
191
-	      maybe_colorize=no; \
192
-	    else \
193
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
194
-	    fi; \
195
-	    shift; \
196
-	    desc=$$1 count=$$2; \
197
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
198
-	      color_start=$$3 color_end=$$std; \
199
-	    else \
200
-	      color_start= color_end=; \
201
-	    fi; \
202
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
203
-	}; \
204
-	create_testsuite_report () \
205
-	{ \
206
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
207
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
208
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
209
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
210
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
211
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
212
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
213
-	}; \
214
-	{								\
215
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
216
-	    $(am__rst_title);						\
217
-	  create_testsuite_report --no-color;				\
218
-	  echo;								\
219
-	  echo ".. contents:: :depth: 2";				\
220
-	  echo;								\
221
-	  for i in $$bases; do						\
222
-	    if grep "^$$ws*:copy-in-global-log:$$ws*no$$ws*$$" $$i.trs \
223
-	         >/dev/null; then continue; \
224
-	    fi; \
225
-	    glob_res=`sed -n -e "s/$$ws*$$//" \
226
-	                     -e "s/^$$ws*:global-test-result:$$ws*//p" \
227
-		        $$i.trs`; \
228
-	    test -n "$$glob_res" || glob_res=RUN; \
229
-	    echo "$$glob_res: $$i" | $(am__rst_section); \
230
-	    if test ! -r $$i.log; then \
231
-	      echo "fatal: making $@: $$i.log is unreadable" >&2; \
232
-	      exit 1; \
233
-	    fi; \
234
-	    cat $$i.log; echo; \
235
-	  done;	\
236
-	} >$(TEST_SUITE_LOG).tmp;					\
237
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
238
-	if $$success; then						\
239
-	  col="$$grn";							\
240
-	 else								\
241
-	  col="$$red";							\
242
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
243
-	fi;								\
244
-	echo "$${col}$$br$${std}"; 					\
245
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
246
-	echo "$${col}$$br$${std}"; 					\
247
-	create_testsuite_report --maybe-color;				\
248
-	echo "$$col$$br$$std";						\
249
-	if $$success; then :; else					\
250
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
251
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
252
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
253
-	  fi;								\
254
-	  echo "$$col$$br$$std";					\
255
-	fi;								\
256
-	$$success || exit 1
257
-
258
-check-TESTS:
259
-	@if test $@ != recheck; then \
260
-	   list='$(RECHECK_LOGS)'; \
261
-	   test -z "$$list" || rm -f $$list; \
262
-	 fi
263
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
264
-	@ws='[ 	]'; \
265
-	log_list='' trs_list=''; $(am__set_TESTS_bases); \
266
-	for i in $$bases; do \
267
-	  if test -z "$$log_list"; then \
268
-	    log_list="$$i.log"; \
269
-	  else \
270
-	    log_list="$$log_list $$i.log"; \
271
-	  fi; \
272
-	  if test -z "$$trs_list"; then \
273
-	    trs_list="$$i.trs"; \
274
-	  else \
275
-	    trs_list="$$trs_list $$i.trs"; \
276
-	  fi; \
277
-	done; \
278
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"
279
-
280
-.sh.log:
281
-	@p='$<'; \
282
-	$(am__set_b); \
283
-	$(am__check_pre) $(SH_LOG_DRIVER) --test-name "$$f" \
284
-	--log-file $$b.log --trs-file $$b.trs \
285
-	$(am__common_driver_flags) -- $(SH_LOG_COMPILE) "$$tst"

+ 0
- 56
parted/files/fix-compile-failure-while-dis.patch View File

@@ -1,57 +0,0 @@
1
-From 060e74354774d36d2c11ef08e3e7ea9b9b6e23fb Mon Sep 17 00:00:00 2001
2
-From: Hongxu Jia <hongxu.jia@windriver.com>
3
-Date: Thu, 13 Nov 2014 11:29:33 +0800
4
-Subject: [PATCH] libparted/arch/linux.c: fix compile failure while
5
- --disable-device-mapper
6
-
7
-While --disable-device-mapper, the MACRO ENABLE_DEVICE_MAPPER is
8
-undef, but it missed to scope some device mapper functions.
9
-
10
-Upstream-Status: Pending
11
-
12
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13
----
14
- libparted/arch/linux.c | 8 ++++++--
15
- 1 file changed, 6 insertions(+), 2 deletions(-)
16
-
17
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
18
-index 6fd73c5..2afa479 100644
19
---- a/libparted/arch/linux.c
20
-+++ b/libparted/arch/linux.c
21
-@@ -2320,6 +2320,7 @@ zasprintf (const char *format, ...)
22
- static char *
23
- dm_canonical_path (PedDevice const *dev)
24
- {
25
-+#ifdef ENABLE_DEVICE_MAPPER
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:
33
-+#endif
34
-         return NULL;
35
- }
36
- 
37
-@@ -2957,13 +2959,15 @@ _disk_sync_part_table (PedDisk* disk)
38
-                                                unsigned long long *start,
39
-                                                unsigned long long *length);
40
- 
41
--
42
-+#ifdef ENABLE_DEVICE_MAPPER
43
-         if (disk->dev->type == PED_DEVICE_DM) {
44
-                 add_partition = _dm_add_partition;
45
-                 remove_partition = _dm_remove_partition;
46
-                 resize_partition = _dm_resize_partition;
47
-                 get_partition_start_and_length = _dm_get_partition_start_and_length;
48
--        } else {
49
-+        } else
50
-+#endif
51
-+        {
52
-                 add_partition = _blkpg_add_partition;
53
-                 remove_partition = _blkpg_remove_partition;
54
- #ifdef BLKPG_RESIZE_PARTITION
55
-1.9.1
56
-

+ 0
- 20
parted/files/fix-doc-mandir.patch View File

@@ -1,20 +0,0 @@
1
-Upstream-Status: Submitted [bug-parted@gnu.org]
2
-
3
-| for po in `ls -1 ./*.pt_BR.po 2>/dev/null`; do \
4
-| 		make $(basename ${po%.pt_BR.po}); \
5
-| 	done
6
-| Makefile:904: *** Recursive variable `mandir' references itself (eventually).  Stop.
7
-
8
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
9
-
10
---- parted-3.1/doc/po4a.mk.orig	2012-03-15 14:09:11.555831872 +0100
11
-+++ parted-3.1/doc/po4a.mk	2012-03-15 14:10:44.243830985 +0100
12
-@@ -23,7 +23,7 @@
13
- # threshold is 80%), it won't be distributed, and the build won't fail.
14
- #
15
- 
16
--mandir = $(mandir)/$(lang)
17
-+mandir := $(mandir)/$(lang)
18
- 
19
- # Inform automake that we want to install some man pages in section 1, 5
20
- # and 8.

+ 0
- 20
parted/files/no_check.patch View File

@@ -1,20 +0,0 @@
1
-Upstream-Status: Inappropriate [configuration]
2
-
3
-If check is detected, it makes the builds non-determinstic so just force
4
-it to be disabled.
5
-
6
-RP - 4/11/08
7
-
8
-Index: parted-1.9.0/configure.ac
9
-===================================================================
10
---- parted-1.9.0.orig/configure.ac	2009-07-23 18:52:08.000000000 +0100
11
-+++ parted-1.9.0/configure.ac	2010-02-02 14:13:56.013905093 +0000
12
-@@ -477,7 +477,7 @@
13
- AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux])
14
- 
15
- dnl check for "check", unit testing library/header
16
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
17
-+have_check=no
18
- if test "$have_check" != "yes"; then
19
-     AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building])
20
- fi

+ 0
- 24
parted/files/resizepart.sh View File

@@ -1,24 +0,0 @@
1
-#!/bin/bash
2
-
3
-################################################################################
4
-# Copyright (c) 2015 Wind River Systems, Inc.
5
-# 
6
-# SPDX-License-Identifier: Apache-2.0
7
-#
8
-################################################################################
9
-
10
-DEVICE=$1
11
-PARTITION=$2
12
-SIZE=$(blockdev --getsize64 ${DEVICE})
13
-SIZE_MB=$((SIZE / (1024*1024)))
14
-
15
-## This is a workaround to allow cloud-init to invoke parted without needing to
16
-## handle command prompts interactively.  Support for non-interactive parted
17
-## commands are not supported on mounted partitions.
18
-##
19
-/usr/sbin/parted ---pretend-input-tty ${DEVICE} resizepart ${PARTITION} << EOF
20
-yes
21
-${SIZE_MB}
22
-EOF
23
-
24
-exit $?

+ 0
- 3
parted/files/run-ptest View File

@@ -1,3 +0,0 @@
1
-#!/bin/sh
2
-
3
-make -C tests check-TESTS

+ 0
- 55
parted/files/syscalls.patch View File

@@ -1,55 +0,0 @@
1
-Upstream-Status: Pending
2
-
3
----
4
- libparted/arch/linux.c |   13 +++++++++++++
5
- 1 file changed, 13 insertions(+)
6
-
7
-Index: parted-1.9.0/libparted/arch/linux.c
8
-===================================================================
9
---- parted-1.9.0.orig/libparted/arch/linux.c	2009-07-23 18:52:08.000000000 +0100
10
-+++ parted-1.9.0/libparted/arch/linux.c	2010-02-02 14:14:16.523904768 +0000
11
-@@ -17,6 +17,8 @@
12
- 
13
- #define PROC_DEVICES_BUFSIZ 16384
14
- 
15
-+#include <linux/version.h>
16
-+
17
- #include <config.h>
18
- #include <arch/linux.h>
19
- 
20
-@@ -1477,12 +1479,14 @@
21
- 
22
- #if SIZEOF_OFF_T < 8
23
- 
24
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
25
- static _syscall5(int,_llseek,
26
-                  unsigned int, fd,
27
-                  unsigned long, offset_high,
28
-                  unsigned long, offset_low,
29
-                  loff_t*, result,
30
-                  unsigned int, origin)
31
-+#endif
32
- 
33
- loff_t
34
- llseek (unsigned int fd, loff_t offset, unsigned int whence)
35
-@@ -1490,11 +1494,20 @@
36
-         loff_t result;
37
-         int retval;
38
- 
39
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
40
-         retval = _llseek(fd,
41
-                          ((unsigned long long)offset) >> 32,
42
-                          ((unsigned long long)offset) & 0xffffffff,
43
-                          &result,
44
-                          whence);
45
-+#else
46
-+ 	retval = syscall(__NR__llseek, fd,
47
-+			 ((unsigned long long)offset) >> 32,
48
-+                         ((unsigned long long)offset) & 0xffffffff,
49
-+                          &result,
50
-+			 whence);
51
-+#endif
52
-+
53
-         return (retval==-1 ? (loff_t) retval : result);
54
- }
55
- 

Loading…
Cancel
Save