|
 |
80b73c |
From 7b0bd868dc58657799bd14eb471efe7f62d875a2 Mon Sep 17 00:00:00 2001
|
|
|
80b73c |
From: Peter Jones <pjones@redhat.com>
|
|
|
80b73c |
Date: Fri, 8 Jun 2018 15:08:21 -0400
|
|
|
80b73c |
Subject: [PATCH] libabigail isn't in RHEL yet, so nerf the abi check.
|
|
|
80b73c |
|
|
|
80b73c |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
80b73c |
---
|
|
|
80b73c |
Make.defaults | 2 --
|
|
|
80b73c |
Make.rules | 11 -----------
|
|
|
80b73c |
Makefile | 12 ++++--------
|
|
|
80b73c |
efivar.spec.in | 7 +------
|
|
|
80b73c |
4 files changed, 5 insertions(+), 27 deletions(-)
|
|
|
80b73c |
|
|
|
80b73c |
diff --git a/Make.defaults b/Make.defaults
|
|
|
80b73c |
index 57cee6e82b5..9ee5c80f910 100644
|
|
|
80b73c |
--- a/Make.defaults
|
|
|
80b73c |
+++ b/Make.defaults
|
|
|
80b73c |
@@ -24,8 +24,6 @@ LDFLAGS := $(LDFLAGS)
|
|
|
80b73c |
AR := $(CROSS_COMPILE)$(COMPILER)-ar
|
|
|
80b73c |
NM := $(CROSS_COMPILE)$(COMPILER)-nm
|
|
|
80b73c |
RANLIB := $(CROSS_COMPILE)$(COMPILER)-ranlib
|
|
|
80b73c |
-ABIDW := abidw
|
|
|
80b73c |
-ABIDIFF := abidiff
|
|
|
80b73c |
|
|
|
80b73c |
PKGS =
|
|
|
80b73c |
|
|
|
80b73c |
diff --git a/Make.rules b/Make.rules
|
|
|
80b73c |
index 042585b533c..585e287f455 100644
|
|
|
80b73c |
--- a/Make.rules
|
|
|
80b73c |
+++ b/Make.rules
|
|
|
80b73c |
@@ -23,17 +23,6 @@ include $(TOPDIR)/Make.version
|
|
|
80b73c |
-o $@ $^ $(LDLIBS)
|
|
|
80b73c |
ln -vfs $@ $@.1
|
|
|
80b73c |
|
|
|
80b73c |
-%.abixml : %.so
|
|
|
80b73c |
- $(ABIDW) --headers-dir $(TOPDIR)/src/include/efivar/ --out-file $@ $^
|
|
|
80b73c |
- @sed -i -s 's,$(TOPDIR)/,,g' $@
|
|
|
80b73c |
-
|
|
|
80b73c |
-%.abicheck : %.so
|
|
|
80b73c |
- $(ABIDIFF) \
|
|
|
80b73c |
- --suppr abignore \
|
|
|
80b73c |
- --headers-dir2 $(TOPDIR)/src/include/efivar/ \
|
|
|
80b73c |
- $(patsubst %.so,%.abixml,$<) \
|
|
|
80b73c |
- $<
|
|
|
80b73c |
-
|
|
|
80b73c |
%.o : %.c
|
|
|
80b73c |
$(CC) $(cflags) -fPIC $(CPPFLAGS) -c -o $@ $(filter %.c %.o %.S,$^)
|
|
|
80b73c |
|
|
|
80b73c |
diff --git a/Makefile b/Makefile
|
|
|
80b73c |
index 8c67b9d2654..e4f76a3a8d4 100644
|
|
|
80b73c |
--- a/Makefile
|
|
|
80b73c |
+++ b/Makefile
|
|
|
80b73c |
@@ -20,13 +20,9 @@ install :
|
|
|
80b73c |
$(MAKE) -C $$x $@ ; \
|
|
|
80b73c |
done
|
|
|
80b73c |
|
|
|
80b73c |
-abidw abicheck efivar efivar-static static:
|
|
|
80b73c |
+efivar efivar-static static:
|
|
|
80b73c |
$(MAKE) -C src $@
|
|
|
80b73c |
|
|
|
80b73c |
-abiupdate :
|
|
|
80b73c |
- $(MAKE) clean all
|
|
|
80b73c |
- $(MAKE) -C src abiclean abixml
|
|
|
80b73c |
-
|
|
|
80b73c |
$(SUBDIRS) :
|
|
|
80b73c |
$(MAKE) -C $@
|
|
|
80b73c |
|
|
|
80b73c |
@@ -39,7 +35,7 @@ a :
|
|
|
80b73c |
exit 1 ; \
|
|
|
80b73c |
fi
|
|
|
80b73c |
|
|
|
80b73c |
-.PHONY: $(SUBDIRS) a brick abiupdate
|
|
|
80b73c |
+.PHONY: $(SUBDIRS) a brick
|
|
|
80b73c |
|
|
|
80b73c |
GITTAG = $(shell bash -c "echo $$(($(VERSION) + 1))")
|
|
|
80b73c |
|
|
|
80b73c |
@@ -51,7 +47,7 @@ clean :
|
|
|
80b73c |
done
|
|
|
80b73c |
@rm -vf efivar.spec
|
|
|
80b73c |
|
|
|
80b73c |
-test-archive: abicheck efivar.spec
|
|
|
80b73c |
+test-archive: efivar.spec
|
|
|
80b73c |
@rm -rf /tmp/efivar-$(GITTAG) /tmp/efivar-$(GITTAG)-tmp
|
|
|
80b73c |
@mkdir -p /tmp/efivar-$(GITTAG)-tmp
|
|
|
80b73c |
@git archive --format=tar $(shell git branch | awk '/^*/ { print $$2 }') | ( cd /tmp/efivar-$(GITTAG)-tmp/ ; tar x )
|
|
|
80b73c |
@@ -70,7 +66,7 @@ bumpver :
|
|
|
80b73c |
tag:
|
|
|
80b73c |
git tag -s $(GITTAG) refs/heads/master
|
|
|
80b73c |
|
|
|
80b73c |
-archive: abicheck bumpver abidw tag efivar.spec
|
|
|
80b73c |
+archive: bumpver tag efivar.spec
|
|
|
80b73c |
@rm -rf /tmp/efivar-$(GITTAG) /tmp/efivar-$(GITTAG)-tmp
|
|
|
80b73c |
@mkdir -p /tmp/efivar-$(GITTAG)-tmp
|
|
|
80b73c |
@git archive --format=tar $(GITTAG) | ( cd /tmp/efivar-$(GITTAG)-tmp/ ; tar x )
|
|
|
80b73c |
diff --git a/efivar.spec.in b/efivar.spec.in
|
|
|
80b73c |
index 180e5374ae6..b55329b265d 100644
|
|
|
80b73c |
--- a/efivar.spec.in
|
|
|
80b73c |
+++ b/efivar.spec.in
|
|
|
80b73c |
@@ -7,7 +7,7 @@ URL: https://github.com/rhinstaller/efivar
|
|
|
80b73c |
Requires: %{name}-libs = %{version}-%{release}
|
|
|
80b73c |
ExclusiveArch: %{ix86} x86_64 aarch64
|
|
|
80b73c |
|
|
|
80b73c |
-BuildRequires: git glibc-static libabigail
|
|
|
80b73c |
+BuildRequires: git glibc-static
|
|
|
80b73c |
Source0: https://github.com/rhboot/efivar/archive/%{version}.tar.gz
|
|
|
80b73c |
|
|
|
80b73c |
%description
|
|
|
80b73c |
@@ -47,11 +47,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
80b73c |
%clean
|
|
|
80b73c |
rm -rf $RPM_BUILD_ROOT
|
|
|
80b73c |
|
|
|
80b73c |
-%check
|
|
|
80b73c |
-%ifarch x86_64
|
|
|
80b73c |
-make abicheck
|
|
|
80b73c |
-%endif
|
|
|
80b73c |
-
|
|
|
80b73c |
%post libs -p /sbin/ldconfig
|
|
|
80b73c |
|
|
|
80b73c |
%postun libs -p /sbin/ldconfig
|
|
|
80b73c |
--
|
|
|
80b73c |
2.17.1
|
|
|
80b73c |
|