|
 |
ab65a7 |
From 09df652105eb466390c00b8599d777e6fed45c41 Mon Sep 17 00:00:00 2001
|
|
|
ab65a7 |
From: Peter Jones <pjones@redhat.com>
|
|
|
ab65a7 |
Date: Mon, 13 Mar 2017 15:48:09 -0400
|
|
|
ab65a7 |
Subject: [PATCH 2/2] Don't build efibootdump on RHEL 7.4...
|
|
|
ab65a7 |
|
|
|
ab65a7 |
Because popt is ancient (1.13 released in 2007, as opposed to 1.16
|
|
|
ab65a7 |
released in 2010), it does not have POPT_ARG_ARGV, which efibootdump
|
|
|
ab65a7 |
uses. Since there's no feature for efibootdump, and we've never shipped
|
|
|
ab65a7 |
it, just nerf it out of the build.
|
|
|
ab65a7 |
|
|
|
ab65a7 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
ab65a7 |
---
|
|
|
ab65a7 |
src/Makefile | 4 +---
|
|
|
ab65a7 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
ab65a7 |
|
|
|
ab65a7 |
diff --git a/src/Makefile b/src/Makefile
|
|
|
ab65a7 |
index 453ddad..162f552 100644
|
|
|
ab65a7 |
--- a/src/Makefile
|
|
|
ab65a7 |
+++ b/src/Makefile
|
|
|
ab65a7 |
@@ -7,7 +7,7 @@ include $(TOPDIR)/Make.defaults
|
|
|
ab65a7 |
|
|
|
ab65a7 |
SUBDIR_CFLAGS = -I$(SRCDIR)/include
|
|
|
ab65a7 |
|
|
|
ab65a7 |
-BINTARGETS=efibootmgr efibootdump
|
|
|
ab65a7 |
+BINTARGETS=efibootmgr
|
|
|
ab65a7 |
TARGETS=$(BINTARGETS)
|
|
|
ab65a7 |
|
|
|
ab65a7 |
all : deps $(TARGETS)
|
|
|
ab65a7 |
@@ -45,9 +45,7 @@ clean :
|
|
|
ab65a7 |
install :
|
|
|
ab65a7 |
$(INSTALL) -d -m 755 $(DESTDIR)/$(sbindir)/
|
|
|
ab65a7 |
$(INSTALL) -m 755 efibootmgr $(DESTDIR)/$(sbindir)/efibootmgr
|
|
|
ab65a7 |
- $(INSTALL) -m 755 efibootdump $(DESTDIR)/$(sbindir)/efibootdump
|
|
|
ab65a7 |
$(INSTALL) -d -m 755 $(DESTDIR)/$(mandir)/man8/
|
|
|
ab65a7 |
$(INSTALL) -m 644 efibootmgr.8 $(DESTDIR)/$(mandir)/man8/efibootmgr.8
|
|
|
ab65a7 |
- $(INSTALL) -m 644 efibootdump.8 $(DESTDIR)/$(mandir)/man8/efibootdump.8
|
|
|
ab65a7 |
|
|
|
ab65a7 |
.PHONY : all deps clean install
|
|
|
ab65a7 |
--
|
|
|
ab65a7 |
2.9.3
|
|
|
ab65a7 |
|