<div dir="ltr">On 15 September 2017 at 01:15, Megha Dey <span dir="ltr"><<a href="mailto:megha.dey@linux.intel.com" target="_blank">megha.dey@linux.intel.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">This patch updates to the latest version of the kexec-tools and<br>
removes patches which are already merged upstream.<br></blockquote><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">-From ea7be6d71b85880e8e8a2c8a4f49a6<wbr>96c5f31ae4 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Sat, 10 Jun 2017 11:18:49 -0700<br>
-Subject: [PATCH] Disable PIE during link<br>
-<br>
-We have explcitly disabled PIE during compile so we<br>
-just need to match it with linker flags<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
- purgatory/Makefile | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/purgatory/Makefile b/purgatory/Makefile<br>
-index 564bdb7..a08e41f 100644<br>
---- a/purgatory/Makefile<br>
-+++ b/purgatory/Makefile<br>
-@@ -59,7 +59,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_<wbr>EXTRA_CFLAGS) \<br>
- -Iinclude \<br>
- -I$(shell $(CC) -print-file-name=include)<br>
- $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_<wbr>EXTRA_CFLAGS)\<br>
-- -Wl,--no-undefined -nostartfiles -nostdlib \<br>
-+ -Wl,--no-undefined -no-pie -nostartfiles -nostdlib \<br>
- -nodefaultlibs -e purgatory_start -Wl,-r \<br>
- -Wl,-Map=$(PURGATORY_MAP)<br></blockquote><div><br></div><div>Was this actually merged upstream, or it caused a conflict?</div><div><br></div><div>I ask because I can't build this:</div><div><br></div><div>| i586-poky-linux-ar rs libutil.a util_lib/compute_ip_checksum.o util_lib/sha256.o</div><div>| i586-poky-linux-ar: creating libutil.a</div><div>| /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</div><div>| collect2: error: ld returned 1 exit status</div><div>| ../kexec-tools-2.0.15/purgatory/Makefile:67: recipe for target 'purgatory/<a href="http://purgatory.ro">purgatory.ro</a>' failed</div><div><br></div><div>Ross </div></div></div></div>