On 15 September 2017 at 01:15, Megha Dey <megha....@linux.intel.com> wrote:
> This patch updates to the latest version of the kexec-tools and > removes patches which are already merged upstream. > > -From ea7be6d71b85880e8e8a2c8a4f49a696c5f31ae4 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.k...@gmail.com> > -Date: Sat, 10 Jun 2017 11:18:49 -0700 > -Subject: [PATCH] Disable PIE during link > - > -We have explcitly disabled PIE during compile so we > -just need to match it with linker flags > - > -Upstream-Status: Pending > - > -Signed-off-by: Khem Raj <raj.k...@gmail.com> > ---- > - purgatory/Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/purgatory/Makefile b/purgatory/Makefile > -index 564bdb7..a08e41f 100644 > ---- a/purgatory/Makefile > -+++ b/purgatory/Makefile > -@@ -59,7 +59,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) > \ > - -Iinclude \ > - -I$(shell $(CC) -print-file-name=include) > - $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ > -- -Wl,--no-undefined -nostartfiles -nostdlib \ > -+ -Wl,--no-undefined -no-pie -nostartfiles -nostdlib > \ > - -nodefaultlibs -e purgatory_start -Wl,-r \ > - -Wl,-Map=$(PURGATORY_MAP) > Was this actually merged upstream, or it caused a conflict? I ask because I can't build this: | i586-poky-linux-ar rs libutil.a util_lib/compute_ip_checksum.o util_lib/sha256.o | i586-poky-linux-ar: creating libutil.a | /data/poky-tmp/master/build/work/i586-poky-linux/kexec-tools/2.0.15-r1/recipe-sysroot-native/usr/bin/i586-poky-linux/../../libexec/i586-poky-linux/gcc/i586-poky-linux/7.2.0/ld: -r and -pie may not be used together | collect2: error: ld returned 1 exit status | ../kexec-tools-2.0.15/purgatory/Makefile:67: recipe for target 'purgatory/ purgatory.ro' failed Ross
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core