fix build with rpm-4.16 and correct --extra-initrd option image path
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
parent
12e62c4f0a
commit
a5c9c3a138
28
0013-Fix-build-with-rpm-4.16.patch
Normal file
28
0013-Fix-build-with-rpm-4.16.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 1afddd618629a97479560bedbdcfa11b2c492a0e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
Date: Fri, 26 Jun 2020 10:02:51 +0200
|
||||||
|
Subject: [PATCH] Fix build with rpm-4.16
|
||||||
|
|
||||||
|
rpmvercmp() was moved to librpmio, so link against this library instead.
|
||||||
|
|
||||||
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 1ab58aeb039..a54b053a30b 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -59,7 +59,7 @@ grubby:: $(OBJECTS)
|
||||||
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(grubby_LIBS)
|
||||||
|
|
||||||
|
rpm-sort::rpm-sort.o
|
||||||
|
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lrpm
|
||||||
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lrpmio
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *.o grubby rpm-sort *~
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
@ -429,7 +429,7 @@ add_bls_fragment() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $extra_initrd ]]; then
|
if [[ -n $extra_initrd ]]; then
|
||||||
append_bls_value "${bls_target}" "initrd" "${extra_initrd}"
|
append_bls_value "${bls_target}" "initrd" " ${extra_initrd}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $MAKEDEBUG = "yes" ]]; then
|
if [[ $MAKEDEBUG = "yes" ]]; then
|
||||||
@ -567,7 +567,7 @@ remove_var_prefix() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $extra_initrd ]]; then
|
if [[ -n $extra_initrd ]]; then
|
||||||
extra_initrd=" /${extra_initrd##${prefix}/}"
|
extra_initrd="/${extra_initrd##${prefix}/}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $kernel ]]; then
|
if [[ -n $kernel ]]; then
|
||||||
@ -683,7 +683,7 @@ while [ ${#} -gt 0 ]; do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--extra-initrd|-i)
|
--extra-initrd|-i)
|
||||||
extra_initrd=" /${2}"
|
extra_initrd="${2}"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--make-default)
|
--make-default)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: grubby
|
Name: grubby
|
||||||
Version: 8.40
|
Version: 8.40
|
||||||
Release: 45%{?dist}
|
Release: 46%{?dist}
|
||||||
Summary: Command line tool for updating bootloader configs
|
Summary: Command line tool for updating bootloader configs
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/rhinstaller/grubby
|
URL: https://github.com/rhinstaller/grubby
|
||||||
@ -27,6 +27,7 @@ Patch0009: 0009-Improve-man-page-for-info-option.patch
|
|||||||
Patch0010: 0010-Fix-GCC-warnings-about-possible-string-truncations-a.patch
|
Patch0010: 0010-Fix-GCC-warnings-about-possible-string-truncations-a.patch
|
||||||
Patch0011: 0011-Fix-stringop-overflow-warning.patch
|
Patch0011: 0011-Fix-stringop-overflow-warning.patch
|
||||||
Patch0012: 0012-Fix-maybe-uninitialized-warning.patch
|
Patch0012: 0012-Fix-maybe-uninitialized-warning.patch
|
||||||
|
Patch0013: 0013-Fix-build-with-rpm-4.16.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: pkgconfig glib2-devel popt-devel
|
BuildRequires: pkgconfig glib2-devel popt-devel
|
||||||
@ -136,6 +137,10 @@ current boot environment.
|
|||||||
%{_mandir}/man8/*.8*
|
%{_mandir}/man8/*.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 26 2020 Javier Martinez Canillas <javierm@redhat.com> - 8.40-46
|
||||||
|
- fix build with rpm-4.16
|
||||||
|
- grubby-bls: fix --extra-initrd option not adding the correct path
|
||||||
|
|
||||||
* Wed May 13 2020 Javier Martinez Canillas <javierm@redhat.com> - 8.40-45
|
* Wed May 13 2020 Javier Martinez Canillas <javierm@redhat.com> - 8.40-45
|
||||||
- grubby-bls: don't replace options with kernelopts if values are the same
|
- grubby-bls: don't replace options with kernelopts if values are the same
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user