rpms/grubby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove wrongly committed patch and bump release

Browse Source 
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2019-04-03 21:06:56 +02:00
parent 063fbf5c5d
commit fcd3f0568a
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
2 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
a.patch
View File

@ -1,44 +0,0 @@
--- /usr/sbin/new-kernel-pkg 2019-04-03 12:19:29.969231795 -0400
+++ /usr/sbin/new-kernel-pkg 2019-04-03 13:02:36.022107582 -0400
@@ -313,6 +313,10 @@
fi
if [ -n "$cfgExtlinux" ]; then
+ if [ -n "$cfguBoot" ]; then
+ kernelImage=$ubootDir/uImage-$version
+ INITRD=$(echo $INITRD | sed "s|$initrdfile|$ubootDir/uInitrd-$version|")
+ fi
[ -n "$verbose" ] && echo "adding $version to $extlinuxConfig"
ARGS="--extlinux -c $extlinuxConfig --add-kernel=$kernelImage \
@@ -443,6 +447,9 @@
fi
if [ -n "$cfgExtlinux" ]; then
+ if [ -n "$cfguBoot" ]; then
+ kernelImage=$ubootDir/uImage-$version
+ fi
[ -n "$verbose" ] && echo "removing $version from $extlinuxConfig"
$grubby --extlinux -c $extlinuxConfig \
--remove-kernel=$kernelImage
@@ -573,6 +580,10 @@
fi
if [ -n "$cfgExtlinux" ]; then
+ if [ -n "$cfguBoot" ]; then
+ kernelImage=$ubootDir/uImage-$version
+ INITRD=$(echo $INITRD | sed "s|$initrdfile|$ubootDir/uInitrd-$version|")
+ fi
[ -n "$verbose" ] && echo "updating $version from $extlinuxConfig"
ARGS="--extlinux -c $extlinuxConfig --update-kernel=$kernelImage \
$DEVTREE $DEVTREEDIR $INITRD ${kernargs:+--args=\"$kernargs\"} \
@@ -604,6 +615,8 @@
rminitrd() {
[ -n "$verbose" ] && echo "removing initrd $initrdfile"
[ -f $initrdfile ] && rm -f $initrdfile
+ [ -n "$verbose" -a -n "$cfguBoot" ] && "removing U-Boot wrapped initrd $ubootDir/uInitrd-$version"
+ [ -n "$cfguBoot" -a -f $ubootDir/uInitrd-$version ] && rm -f $ubootDir/uInitrd-$version
}
doDepmod() {

6
grubby.spec
View File

@ -1,6 +1,6 @@
Name: grubby
Version: 8.40
Release: 30.0.risc64%{?dist}
Release: 30.1.risc64%{?dist}
Summary: Command line tool for updating bootloader configs
License: GPLv2+
URL: https://github.com/rhinstaller/grubby
@ -137,6 +137,10 @@ current boot environment.
%endif
%changelog
* Wed Apr 03 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 8.40-30.1.riscv64
- Make grubby use U-Boot wrapped kernel and ramdisk for extlinux
configuration on RISC-V
* Sat Mar 30 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 8.40-30.0.riscv64
- Bring back U-Boot wrapped images support for RISC-V (riscv64)