diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2016-05-10 12:19:37 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-19 12:02:39 +0200 |
| commit | f0a1e61c478ecb69bb457891ea0629e156a78377 (patch) | |
| tree | 589bc0c5b6080c8086afeb27809271f066b75991 /meta-oe/recipes-extended | |
| parent | d68c687673a42afe5047481e9efe8c13de088f80 (diff) | |
| download | meta-openembedded-contrib-f0a1e61c478ecb69bb457891ea0629e156a78377.tar.gz | |
efivar: fix do_install failed
It fixes efivar.pc not found:
...
| install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/
| install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/
; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/
;
| install: cannot stat 'efivar.pc': No such file or directory
| install: cannot stat 'efiboot.pc': No such file or directory
| make[1]: *** [install] Error 1
| make[1]: Leaving directory `efivar/0.23-r0/git/src'
| make: *** [install] Error 2
| ERROR: oe_runmake failed
...
Also sync with latest upstream
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch | 44 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/efivar/efivar_0.23.bb | 3 |
2 files changed, 46 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch b/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch new file mode 100644 index 0000000000..3f43f2a93e --- /dev/null +++ b/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch @@ -0,0 +1,44 @@ +From 7ead29ca6bb5e280ae07551cc3521281ecf73682 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 7 May 2016 02:06:47 -0400 +Subject: [PATCH] Makefile: fix efivar.pc not found + +It fixes efivar.pc not found: +... +| install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/ +| install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ +; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ +; +| install: cannot stat 'efivar.pc': No such file or directory +| install: cannot stat 'efiboot.pc': No such file or directory +| make[1]: *** [install] Error 1 +| make[1]: Leaving directory `efivar/0.23-r0/git/src' +| make: *** [install] Error 2 +| ERROR: oe_runmake failed +... + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index c7a0ca3..ad9c427 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -78,7 +78,9 @@ install : all + ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x).$(MAJOR_VERSION);\ + ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x); ) + $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR) +- $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;) ++ $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(TOPDIR)/src/$(x).in $(DESTDIR)$(PCDIR)/$(x) ;\ ++ sed -i -e "s:@@LIBDIR@@:$(libdir):g" -e "s:@@VERSION@@:$(VERSION):g" \ ++ $(DESTDIR)$(PCDIR)/$(x); ) + $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar + $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));) + $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) +-- +2.8.1 + diff --git a/meta-oe/recipes-extended/efivar/efivar_0.23.bb b/meta-oe/recipes-extended/efivar/efivar_0.23.bb index b41be0335d..9c474612a2 100644 --- a/meta-oe/recipes-extended/efivar/efivar_0.23.bb +++ b/meta-oe/recipes-extended/efivar/efivar_0.23.bb @@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" DEPENDS_class-target = "popt efivar-native" -SRCREV = "01abee43d6d6e755f56a4135ab5aa0bfad609ce2" +SRCREV = "7367d78281fa3ce390e10c7c9f4608c58e7a6d3d" SRC_URI = "git://github.com/rhinstaller/efivar.git" SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ file://0002-disable-static-build.patch \ + file://0003-efivar-fix-for-cross-compile.patch \ " S = "${WORKDIR}/git" |