diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2018-03-28 02:41:58 -0400 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
| commit | 364c9201cb51fcd9cf0c359e743a1962be539fde (patch) | |
| tree | 2fcfd463df7834173f9ab18e36871c56a4fd90a0 /meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch | |
| parent | 49390ebce5716963219a48ad97673fa50758348e (diff) | |
| download | meta-openembedded-contrib-364c9201cb51fcd9cf0c359e743a1962be539fde.tar.gz | |
efivar: refresh the patches
fixes
WARNING: efivar-0.31-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch allow-multi-definitions-for-native.patch
patching file Make.rules
Hunk #1 succeeded at 20 with fuzz 2.
Now at patch allow-multi-definitions-for-native.patch
Now at patch 0003-efivar-fix-for-cross-compile.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch')
| -rw-r--r-- | meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch b/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch index 3f43f2a93e..83105fe0d1 100644 --- a/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch @@ -1,4 +1,4 @@ -From 7ead29ca6bb5e280ae07551cc3521281ecf73682 Mon Sep 17 00:00:00 2001 +From dea4a55714249b2734a36701120fd22c91c64ec2 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 @@ -20,17 +20,18 @@ It fixes efivar.pc not found: 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 +index dcc7fc8..691aa8a 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); ) +@@ -94,7 +94,9 @@ install : all + ln -fs $(x).1.$(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) ;\ @@ -39,6 +40,3 @@ index c7a0ca3..ad9c427 100644 $(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 - |