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/allow-multi-definitions-for-native.patch | |
| parent | 49390ebce5716963219a48ad97673fa50758348e (diff) | |
| download | meta-openembedded-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/allow-multi-definitions-for-native.patch')
| -rw-r--r-- | meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch b/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch index 87f555509b..f88af1fe17 100644 --- a/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch +++ b/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch @@ -1,3 +1,8 @@ +From c801dcb03d42eb533a9bead0b397d7ce4fc5a6fe Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 10 Aug 2016 17:49:50 +0800 +Subject: [PATCH] allow multi definitions for native + Upstream-Status: Pending It fails to create .so file when build efivar-native: @@ -8,16 +13,20 @@ It fails to create .so file when build efivar-native: Add link option '-z muldefs' to fix it. Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- + Make.rules | 1 + + 1 file changed, 1 insertion(+) + diff --git a/Make.rules b/Make.rules -index d9c0609..874bce0 100644 +index 88b9aa7..799332f 100644 --- a/Make.rules +++ b/Make.rules @@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \ - -Wl,-soname,$@.$(MAJOR_VERSION) \ + -Wl,-soname,$@.1 \ -Wl,--version-script=$(MAP) \ + -Wl,-z,muldefs \ -o $@ $^ $(LDLIBS) - %.o : %.c + %.abixml : %.so |