|
 |
ac385c |
From 78bda9cefdb5e29cedd379c1b9ea9fd8274d7c5d Mon Sep 17 00:00:00 2001
|
|
|
ac385c |
From: Peter Jones <pjones@redhat.com>
|
|
|
ac385c |
Date: Mon, 13 Mar 2017 13:05:58 -0400
|
|
|
ac385c |
Subject: [PATCH 1/3] libabigail isn't in RHEL yet, so nerf the abi check.
|
|
|
ac385c |
|
|
|
ac385c |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
ac385c |
---
|
|
|
ac385c |
Make.rules | 9 ---------
|
|
|
ac385c |
Makefile | 6 +++---
|
|
|
ac385c |
src/Makefile | 5 -----
|
|
|
ac385c |
3 files changed, 3 insertions(+), 17 deletions(-)
|
|
|
ac385c |
|
|
|
ac385c |
diff --git a/Make.rules b/Make.rules
|
|
|
ac385c |
index 88b9aa7..a7d6a23 100644
|
|
|
ac385c |
--- a/Make.rules
|
|
|
ac385c |
+++ b/Make.rules
|
|
|
ac385c |
@@ -22,15 +22,6 @@ include $(TOPDIR)/Make.version
|
|
|
ac385c |
-Wl,--version-script=$(MAP) \
|
|
|
ac385c |
-o $@ $^ $(LDLIBS)
|
|
|
ac385c |
|
|
|
ac385c |
-%.abixml : %.so
|
|
|
ac385c |
- $(ABIDW) --headers-dir $(TOPDIR)/src/include/efivar/ --out-file $@ $^
|
|
|
ac385c |
-
|
|
|
ac385c |
-%.abicheck : %.so
|
|
|
ac385c |
- $(ABIDIFF) --suppr \
|
|
|
ac385c |
- $(patsubst %.so,%.abignore,$<) \
|
|
|
ac385c |
- $(patsubst %.so,%.abixml,$<) \
|
|
|
ac385c |
- $<
|
|
|
ac385c |
-
|
|
|
ac385c |
%.o : %.c
|
|
|
ac385c |
$(CC) $(cflags) -fPIC $(CPPFLAGS) -c -o $@ $(filter %.c %.o %.S,$^)
|
|
|
ac385c |
|
|
|
ac385c |
diff --git a/Makefile b/Makefile
|
|
|
ac385c |
index 4d6d308..504a747 100644
|
|
|
ac385c |
--- a/Makefile
|
|
|
ac385c |
+++ b/Makefile
|
|
|
ac385c |
@@ -17,7 +17,7 @@ install :
|
|
|
ac385c |
$(MAKE) -C $$x $@ ; \
|
|
|
ac385c |
done
|
|
|
ac385c |
|
|
|
ac385c |
-abidw abicheck efivar efivar-static static:
|
|
|
ac385c |
+efivar efivar-static static:
|
|
|
ac385c |
$(MAKE) -C src $@
|
|
|
ac385c |
|
|
|
ac385c |
$(SUBDIRS) :
|
|
|
ac385c |
@@ -44,7 +44,7 @@ clean :
|
|
|
ac385c |
|
|
|
ac385c |
GITTAG = $(VERSION)
|
|
|
ac385c |
|
|
|
ac385c |
-test-archive: abicheck efivar.spec
|
|
|
ac385c |
+test-archive: efivar.spec
|
|
|
ac385c |
@rm -rf /tmp/efivar-$(VERSION) /tmp/efivar-$(VERSION)-tmp
|
|
|
ac385c |
@mkdir -p /tmp/efivar-$(VERSION)-tmp
|
|
|
ac385c |
@git archive --format=tar $(shell git branch | awk '/^*/ { print $$2 }') | ( cd /tmp/efivar-$(VERSION)-tmp/ ; tar x )
|
|
|
ac385c |
@@ -58,7 +58,7 @@ test-archive: abicheck efivar.spec
|
|
|
ac385c |
tag:
|
|
|
ac385c |
git tag -s $(GITTAG) refs/heads/master
|
|
|
ac385c |
|
|
|
ac385c |
-archive: abicheck abidw tag efivar.spec
|
|
|
ac385c |
+archive: tag efivar.spec
|
|
|
ac385c |
@rm -rf /tmp/efivar-$(VERSION) /tmp/efivar-$(VERSION)-tmp
|
|
|
ac385c |
@mkdir -p /tmp/efivar-$(VERSION)-tmp
|
|
|
ac385c |
@git archive --format=tar $(GITTAG) | ( cd /tmp/efivar-$(VERSION)-tmp/ ; tar x )
|
|
|
ac385c |
diff --git a/src/Makefile b/src/Makefile
|
|
|
ac385c |
index 0c16597..a5d98ec 100644
|
|
|
ac385c |
--- a/src/Makefile
|
|
|
ac385c |
+++ b/src/Makefile
|
|
|
ac385c |
@@ -32,11 +32,6 @@ all : $(TARGETS)
|
|
|
ac385c |
|
|
|
ac385c |
static : $(STATICTARGETS)
|
|
|
ac385c |
|
|
|
ac385c |
-abidw : $(patsubst %.so,%.abixml,$(LIBTARGETS))
|
|
|
ac385c |
- git commit -m "Update .abixml files" -s $^
|
|
|
ac385c |
-
|
|
|
ac385c |
-abicheck : $(patsubst %.so,%.abicheck,$(LIBTARGETS))
|
|
|
ac385c |
-
|
|
|
ac385c |
./guid-symbols.c : include/efivar/efivar-guids.h
|
|
|
ac385c |
./guids.bin : include/efivar/efivar-guids.h
|
|
|
ac385c |
./names.bin : include/efivar/efivar-guids.h
|
|
|
ac385c |
--
|
|
|
ac385c |
2.9.3
|
|
|
ac385c |
|