-
Notifications
You must be signed in to change notification settings - Fork 0
/
grubby-with-uboot.spec
459 lines (356 loc) · 16.1 KB
/
grubby-with-uboot.spec
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
%define _with_uboot 1
Name: grubby%{?_with_uboot:-with-uboot}
Version: 8.40
Release: 12%{?dist}
Summary: Command line tool for updating bootloader configs
License: GPLv2+
URL: https://github.com/rhinstaller/grubby
# we only pull git snaps at the moment
# git clone [email protected]:rhinstaller/grubby.git
# git archive --format=tar --prefix=grubby-%%{version}/ HEAD |bzip2 > grubby-%%{version}.tar.bz2
# Source0: %%{name}-%%{version}.tar.bz2
Source0: https://github.com/rhboot/grubby/archive/%{version}-1.tar.gz
%if ! 0%{?_with_uboot}
Patch1: drop-uboot-uImage-creation.patch
%endif
Patch2: 0001-Change-return-type-in-getRootSpecifier.patch
Patch3: 0002-Add-btrfs-subvolume-support-for-grub2.patch
Patch4: 0003-Add-tests-for-btrfs-support.patch
BuildRequires: pkgconfig glib2-devel popt-devel
BuildRequires: libblkid-devel git-core
# for make test / getopt:
BuildRequires: util-linux-ng
%ifarch aarch64 i686 x86_64 %{power64}
BuildRequires: grub2-tools-minimal
Requires: grub2-tools-minimal
Requires: grub2-tools
%endif
%ifarch s390 s390x
Requires: s390utils-base
%endif
%if 0%{?_with_uboot}
Conflicts: grubby
Provides: grubby = %{version}-%{release}
Provides: grubby%{?_isa} = %{version}-%{release}
%endif
%description
grubby is a command line tool for updating and displaying information about
the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc)
and zipl (s390) boot loaders. It is primarily designed to be used from scripts
which install new kernels and need to find information about the current boot
environment.
%prep
%setup -q -n grubby-%{version}-1
git init
git config user.email "[email protected]"
git config user.name "no one"
git add .
git commit -a -q -m "%{version} baseline"
git am %{patches} </dev/null
git config --unset user.email
git config --unset user.name
%build
make %{?_smp_mflags}
%ifnarch aarch64 %{arm}
%check
make test
%endif
%install
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%postun
if [ "$1" = 0 ] ; then
grub2-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || :
fi
%files
%{!?_licensedir:%global license %%doc}
%license COPYING
/sbin/installkernel
/sbin/new-kernel-pkg
/sbin/grubby
%{_mandir}/man8/*.8*
%changelog
* Tue Apr 10 2018 Javier Martinez Canillas <[email protected]> - 8.40-12
- Use .rpmsave as backup suffix when switching to BLS configuration
* Fri Apr 06 2018 Javier Martinez Canillas <[email protected]> - 8.40-11
- Switch grub2 config to BLS configuration on %%postun
* Sat Mar 03 2018 Nathaniel McCallum <[email protected]> - 8.40-10
- Add support for /boot on btrfs subvolumes
* Wed Feb 07 2018 Fedora Release Engineering <[email protected]> - 8.40-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jan 24 2018 Peter Robinson <[email protected]> 8.40-8
- Drop u-boot uImage generation on ARMv7
- Minor cleanups
* Tue Sep 12 2017 Peter Jones <[email protected]> - 8.40-7
- Explicitly require grub2-tools on platforms that need grub2-editenv
- Minor packaging cleanups
* Wed Aug 02 2017 Fedora Release Engineering <[email protected]> - 8.40-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <[email protected]> - 8.40-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <[email protected]> - 8.40-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <[email protected]> - 8.40-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <[email protected]> - 8.40-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Apr 15 2015 Peter Jones <[email protected]> - 8.40-1
- Update to 8.40
- More work on the thing that went to testing in 8.39
Resolves: rhbz#1211887
* Tue Apr 14 2015 Peter Jones <[email protected]> - 8.39-1
- Update to 8.39
- Fix title extraction with some config file types
Resolves: rhbz#1204353
Resolves: rhbz#1204888
Resolves: rhbz#1206943
* Tue Apr 14 2015 Peter Jones <[email protected]> - 8.38-1
- Update to 8.38
- Fix title extraction with some config file types
Resolves: rhbz#1204353
Resolves: rhbz#1204888
Resolves: rhbz#1206943
* Tue Mar 17 2015 Peter Jones <[email protected]> - 8.37-1
- Update to 8.37
- Fix test case from 8.35 on ppc64
Resolves: rhbz#1202876
* Thu Nov 13 2014 Peter Jones <[email protected]> - 8.35-9
- Disable "make check" on arm builds; right now the test suite is broken
there and raises false positives constantly.
* Mon Oct 27 2014 Peter Jones <[email protected]> - 8.35-8
- Treat kernel and kernel-core as identical in terms of --make-default
Resolves: rhbz#1141414
* Thu Oct 16 2014 Peter Jones <[email protected]> - 8.35-7
- Revert "debug" image creation for now
Resolves: rhbz#1153410
- Fix minor quoting errors in dtbdir code
Resolves: rhbz#1088933
* Wed Oct 15 2014 Peter Jones <[email protected]> - 8.35-6
- Update grubby to support device tree options for arm. Again.
Resolves: rhbz#1088933
* Fri Sep 26 2014 Peter Jones <[email protected]> - 8.35-5
- See if what people are seeing in 1141414 is actually 957681
Related: rhbz#957681
Related: rhbz#1141414
* Sat Aug 16 2014 Fedora Release Engineering <[email protected]> - 8.35-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jul 12 2014 Tom Callaway <[email protected]> - 8.35-3
- fix license handling
* Sat Jun 07 2014 Fedora Release Engineering <[email protected]> - 8.35-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed May 21 2014 Peter Jones <[email protected]> - 8.35-1
- Fix a minor test case error that causes koji builds to fail.
Related: rhbz#1096358
* Wed May 21 2014 Peter Jones <[email protected]> - 8.34-1
- Make grub2 "--copy-default --add-kernel=foo --initrd=bar" work when default
has no initrd line.
Resolves: rhbz#1099627
Related: rhbz#1096358
* Tue Apr 01 2014 Peter Jones <[email protected]> - 8.33-1
- Fix --devtree test in new-kernel-pkg even harder (#1082318)
* Mon Mar 31 2014 Peter Jones <[email protected]> - 8.32-1
- Fix --devtree test in new-kernel-pkg (#1082318)
- Fix aarch64 #define test.
* Fri Mar 28 2014 Peter Jones <[email protected]> - 8.31-1
- Update to 8.31
- Fold in patches from Fedora and RHEL 7 trees
* Mon Jan 20 2014 Lubomir Rintel <[email protected]> - 8.28-2
- Fix extlinux default
* Fri Aug 02 2013 Peter Jones <[email protected]> - 8.28-1
- More work on grub's "saved_entry" system.
Resolves: rhbz#768106
Resolves: rhbz#736188
* Tue Jul 30 2013 Peter Jones <[email protected]> - 8.27-1
- Make grubby understand grub's "saved_entry" system
Resolves: rhbz#768106
Resolves: rhbz#736188
- BuildRequire grub2 on appropriate platforms, for the test suite.
* Fri Jun 07 2013 Dennis Gilmore <[email protected]> - 8.26-2
- add patch to update extlinux.conf file on arm if it exists
* Fri May 10 2013 Peter Jones <[email protected]> - 8.26-1
- Conditionally call arm-boot-config's boot.scr generator if available
Resolves: rhbz#952428
* Tue Apr 09 2013 Peter Jones <[email protected]> - 8.25-1
- Error instead of segfaulting if we can't find any working config
Resolves: rhbz#912873
Resolves: rhbz#751608
* Tue Mar 19 2013 Peter Jones <[email protected]> - 8.24-1
- Fix module remove code from Harald (#923441)
* Mon Mar 11 2013 Peter Jones <[email protected]> - 8.23-1
- Update to 8.23
- Fix empty root device in case of an empty /etc/fstab (lemenkov)
- General refactoring and cleanup (harald)
- Don't clean up modules.* so aggressively (harald)
* Wed Feb 20 2013 Peter Jones <[email protected]> - 8.22-3
- Add --debug style logging (for both success and failures) to /var/log/grubby
* Thu Feb 14 2013 Fedora Release Engineering <[email protected]> - 8.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Jan 04 2013 Peter Jones <[email protected]> - 8.22-1
- Revert test case for rhbz#742885 - it's a work in progress that isn't
ready yet.
* Fri Jan 04 2013 Peter Jones <[email protected]> - 8.21-1
- Use systemd vconsole.conf and locale.conf if present
Resolves rhbz#881908
- Avoid unnecessary stat calls (from Ville Skyttä)
Resolves rhbz#741135
- Spelling fixes (Ville Skyttä)
- Add a test case for rhbz#742885
- Handle case-insensitive extlinux config files properly (from Johannes Weiner)
* Tue Oct 02 2012 Peter Jones <[email protected]> - 8.20-1
- Handle linuxefi initrd and removal correctly.
Resolves: rhbz#859285
* Wed Sep 26 2012 Peter Jones <[email protected]> - 8.19-1
- Don't accidentally migrate from linuxefi back to linux
Related: rhbz#859285
* Fri Sep 21 2012 Peter Jones <[email protected]> - 8.18-1
- Change the way the kernel load address is determined for ARM U-Boot.
* Wed Aug 08 2012 Peter Jones <[email protected]> - 8.17-1
- Update to 8.17
- Fixes a "make test" failure.
* Wed Aug 08 2012 Peter Jones <[email protected]> - 8.16-1
- Update to 8.16
- Handle "linuxefi" directive on grub2/uefi machines.
* Thu Jul 19 2012 Fedora Release Engineering <[email protected]> - 8.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jun 25 2012 Peter Jones <[email protected]> - 8.15-1
- Update to 8.15
- Revert dirname change from 8.13; it was wrong.
* Thu Jun 14 2012 Peter Jones <[email protected]> - 8.14-1
- Update to 8.14 to fix a build problem.
* Thu Jun 14 2012 Peter Jones <[email protected]> - 8.13-1
- Update to 8.13
- Add some more ARM tweaks (dmartin)
- Better support for other distros (crosa)
* Tue Jun 12 2012 Peter Jones <[email protected]> - 8.12-2
- Support UBOOT_IMGADDR override on ARM (blc)
* Thu May 31 2012 Peter Jones <[email protected]> - 8.12-1
- Update to 8.12
- Preserve trailing indentation when splitting line elements (mads)
Resolves: rhbz#742720
- Pick last device mounted on / (pjones,bcl)
Related: rhbz#820340
Related: rhbz#820351
* Wed Mar 21 2012 Peter Jones <[email protected]> - 8.11-1
- Update to 8.11
Resolves: rhbz#805310
* Thu Mar 15 2012 Peter Jones <[email protected]> - 8.10-1
- Update to 8.10
- Use "isquote" where appropriate
- Make --remove-kenrel support titles in grub2 (jianzhong.huang)
- Use grub2 if it's there on ppc.
* Fri Mar 02 2012 Peter Jones <[email protected]> - 8.9-1
- Refactor grub2 title extraction, making it a function (Cleber Rosa)
- Include prefix when printing kernel information (Cleber Rosa)
- Implement support for "default saved" for grub2 (Cleber Rosa)
- Try to display title when printing information with '--info' (Cleber Rosa)
- new-kernel-pkg fails to find U-Boot. (D. Marlin)
- Add support to new-kernel-pkg to recognize ARCH == armv5tel needed for Kir
(D.Marlin)
- Include a / when one is missing in paths (#769641)
- Fix hard coded paths so kernel's "make install" will DTRT.
- Fix endswith() to correctly test its input for validity.
* Tue Feb 07 2012 Dennis Gilmore <[email protected]> - 8.8-3
- add uboot-tools requires on arm arches
- add uboot config file on arm arches
* Fri Jan 13 2012 Fedora Release Engineering <[email protected]> - 8.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Dec 20 2011 Peter Jones <[email protected]> - 8.8-1
- Fix test cases from 8.7 to work on a system without /boot mounted.
* Tue Dec 20 2011 Peter Jones <[email protected]> - 8.7-1
- Add a --debug to try to help diagnose "No suitable template". (sandeen,pjones)
* Mon Dec 19 2011 Peter Jones <[email protected]> - 8.6-1
- Fix a "make test" errors introduced in 8.4-1
* Sat Dec 17 2011 Peter Jones <[email protected]> - 8.5-1
- Don't hardcode dracut path
Resolves: #768645
* Thu Dec 08 2011 Adam Williamson <[email protected]> - 8.4-1
- Update to 8.4:
+ fix Loading... line for updated kernels
+ Add new '--default-title' feature
+ Add new '--default-index' feature
+ add feature for testing the output of a grubby command
+ Fix detection when comparing stage1 to MBR
+ do not link against glib-2.0
+ Don't crash if grubConfig not found
+ Adding extlinux support for new-kernel-pkg
+ Look for Debian / Ubuntu grub config files (#703260)
+ Make grubby recognize Ubuntu's spin of Grub2 (#703260)
* Thu Sep 29 2011 Peter Jones <[email protected]> - 8.3-1
- Fix new-kernel-pkg invocation of grubby for grub (patch from Mads Kiilerich)
Resolves: rhbz#725185
* Wed Sep 14 2011 Peter Jones <[email protected]> - 8.2-1
- Fixes for xen (from Michael Petullo)
Resolves: rhbz#658387
* Fri Jul 22 2011 Peter Jones <[email protected]> - 8.1-1
- Update to 8.1
- Fix miss-spelled variable name in new-kernel-pkg
* Thu Jul 21 2011 Peter Jones <[email protected]> - 8.0-1
- Add support for grub2.
* Tue Jun 07 2011 Brian C. Lane <[email protected]> - 7.0.18-1
- Bump version to 7.0.18 (bcl)
- Fixup new-kernel-pkg errors (#711493) (bcl)
* Mon Jun 06 2011 Peter Jones <[email protected]> - 7.0.17-1
- Fix references to wrong program name in new-kernel-pkg.8
Resolves: rhbz#663981
* Wed Feb 09 2011 Fedora Release Engineering <[email protected]> - 7.0.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Mon Jan 24 2011 Karsten Hopp <[email protected]> 7.0.16-2
- add BR utils-linux-ng for getopt
* Tue Jul 13 2010 Brian C. Lane <[email protected]> - 7.0.16-1
- Update to 7.0.16
- Add patch to check the return value of getuuidbydev
- Resolves: rhbz#592294
* Wed Apr 14 2010 Peter Jones <[email protected]> - 7.0.15-1
- Update to 7.0.15
- Add man pages for installkernel and new-kernel-pkg
Resolves: rhbz#529333
* Wed Apr 14 2010 Peter Jones <[email protected]> - 7.0.14-1
- Update to 7.0.14
* Thu Feb 11 2010 Peter Jones <[email protected]> - 7.0.13-1
- Strip boot partition prefix from initrd path if present during --update.
Related: rhbz#557922
- add host only support for local kernel compiles (airlied)
* Mon Feb 08 2010 Peter Jones <[email protected]> - 7.0.12-1
- compare rootdev using uuid instead of stat, for better btrfs support (josef)
Resolves: rhbz#530108
* Mon Feb 08 2010 Peter Jones <[email protected]> - 7.0.11-1
- Make it possible to update the initrd without any other change.
Related: rhbz#557922
* Fri Feb 05 2010 Peter Jones <[email protected]> - 7.0.10-1
- Make --update able to add an initramfs.
Related: rhbz#557922
* Mon Nov 30 2009 Peter Jones <[email protected]> - 7.0.9-3
- Use s390utils-base as the s390 dep, not s390utils
Related: rhbz#540565
* Tue Nov 24 2009 Peter Jones <[email protected]> - 7.0.9-2
- Add s390utils dep when on s390, since new-kernel-package needs it.
Resolves: rhbz#540565
* Fri Oct 30 2009 Peter Jones <[email protected]> - 7.0.9-1
- Add support for dracut to installkernel (notting)
* Thu Oct 1 2009 Hans de Goede <[email protected]> - 7.0.8-1
- Stop using nash
* Fri Sep 11 2009 Hans de Goede <[email protected]> - 7.0.7-1
- Remove writing rd_plytheme=$theme to kernel args in dracut mode (hansg)
- Add a couple of test cases for extra initrds (rstrode)
- Allow tmplLine to be NULL in getInitrdVal (rstrode)
* Fri Sep 11 2009 Peter Jones <[email protected]> - 7.0.6-1
- Fix test case breakage from 7.0.5 (rstrode)
* Fri Sep 11 2009 Peter Jones <[email protected]> - 7.0.5-1
- Add support for plymouth as a second initrd. (rstrode)
Resolves: rhbz#520515
* Wed Sep 09 2009 Hans de Goede <[email protected]> - 7.0.4-1
- Add --dracut cmdline argument for %%post generation of dracut initrd
* Wed Aug 26 2009 Hans de Goede <[email protected]> - 7.0.3-1
- Silence error when no /etc/sysconfig/keyboard (#517187)
* Fri Aug 7 2009 Hans de Goede <[email protected]> - 7.0.2-1
- Add --add-dracut-args new-kernel-pkg cmdline option
* Fri Jul 24 2009 Fedora Release Engineering <[email protected]> - 7.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Fri Jul 17 2009 Jeremy Katz <[email protected]> - 7.0.1-1
- Fix blkid usage (#124246)
* Wed Jun 24 2009 Jeremy Katz <[email protected]> - 7.0-1
- BR libblkid-devel now instead of e2fsprogs-devel
- Add bits to switch to using dracut for new-kernel-pkg
* Wed Jun 3 2009 Jeremy Katz <[email protected]> - 6.0.86-2
- add instructions for checking out from git
* Tue Jun 2 2009 Jeremy Katz <[email protected]> - 6.0.86-1
- initial build after splitting out from mkinitrd