All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christopher Clark" <christopher.w.clark@gmail.com>
To: meta-virtualization@yoctoproject.org
Cc: bruce.ashfield@gmail.com,
	Christopher Clark <christopher.w.clark@gmail.com>
Subject: [meta-virtualization][PATCH] ipxe: fix build with uprev to the latest git revision
Date: Sun,  9 Feb 2020 21:07:36 -0800	[thread overview]
Message-ID: <20200210050754.3534-2-christopher.w.clark@gmail.com> (raw)
In-Reply-To: <20200210050754.3534-1-christopher.w.clark@gmail.com>

From: Christopher Clark <christopher.w.clark@gmail.com>

Newer version allows for a simpler version of the cross-compile patch,
which is updated in this change.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
---
Compile-tested only.

 .../files/ipxe-fix-hostcc-nopie-cflags.patch  | 58 ++-----------------
 recipes-extended/ipxe/ipxe_git.bb             |  2 +-
 2 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/recipes-extended/ipxe/files/ipxe-fix-hostcc-nopie-cflags.patch b/recipes-extended/ipxe/files/ipxe-fix-hostcc-nopie-cflags.patch
index da154a6..865e9bb 100644
--- a/recipes-extended/ipxe/files/ipxe-fix-hostcc-nopie-cflags.patch
+++ b/recipes-extended/ipxe/files/ipxe-fix-hostcc-nopie-cflags.patch
@@ -1,34 +1,17 @@
-Fix detection of host compiler "no-pie"/"nopie" and link flags.
-
-Detection of the "no-pie" vs "nopie" flag needs to be performed for both
-the host and target compilers; cannot assume that one works for the other.
-
-Use EXTRA_HOST_CFLAGS and EXTRA_HOST_LDFLAGS variables for passing
-host tool parameters if required. Removes previous hardcoded "-O2 -g".
-
-Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
-diff --git a/Makefile.housekeeping b/Makefile.housekeeping
-index f833492..5451c39 100644
+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
+index 1dd1479..13f44dd 100644
 --- a/Makefile.housekeeping
 +++ b/Makefile.housekeeping
-@@ -133,6 +133,7 @@ eval :
- WORKAROUND_CFLAGS :=
- WORKAROUND_ASFLAGS :=
- WORKAROUND_LDFLAGS :=
-+WORKAROUND_HOST_CFLAGS :=
- 
- # Make syntax does not allow use of comma or space in certain places.
- # This ugly workaround is suggested in the manual.
-@@ -445,7 +446,7 @@ endif
+@@ -454,7 +454,7 @@ endif
  CFLAGS		+= $(WORKAROUND_CFLAGS) $(EXTRA_CFLAGS)
  ASFLAGS		+= $(WORKAROUND_ASFLAGS) $(EXTRA_ASFLAGS)
  LDFLAGS		+= $(WORKAROUND_LDFLAGS) $(EXTRA_LDFLAGS)
--HOST_CFLAGS	+= $(WORKAROUND_CFLAGS) -O2 -g
-+HOST_CFLAGS	+= $(WORKAROUND_HOST_CFLAGS) $(EXTRA_HOST_CFLAGS)
+-HOST_CFLAGS	+= -O2 -g
++HOST_CFLAGS	+= -O2 -g $(EXTRA_HOST_CFLAGS)
  
  # Inhibit -Werror if NO_WERROR is specified on make command line
  #
-@@ -1375,7 +1376,7 @@ endif # defined(BIN)
+@@ -1379,7 +1379,7 @@ endif # defined(BIN)
  # The compression utilities
  #
  
@@ -37,32 +20,3 @@ index f833492..5451c39 100644
  
  $(ZBIN) : util/zbin.c $(MAKEDEPS)
  	$(QM)$(ECHO) "  [HOSTCC] $@"
-diff --git a/arch/i386/Makefile b/arch/i386/Makefile
-index b7c2792..4a637ad 100644
---- a/arch/i386/Makefile
-+++ b/arch/i386/Makefile
-@@ -78,11 +78,20 @@ CFLAGS			+= -Ui386
- # -nopie.  We therefore test for both.
- #
- ifeq ($(CCTYPE),gcc)
--PIE_TEST = [ -z "`$(CC) -fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1`" ]
--PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -no-pie')
--PIE_TEST2 = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
-+PIE_TEST1_FLAGS = "-fno-PIE -no-pie -x c -c /dev/null -o /dev/null 2>&1"
-+PIE_TEST2_FLAGS = "-fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1"
-+
-+PIE_TEST1 = [ -z "`$(CC) "$(PIE_TEST1_FLAGS)"`" ]
-+PIE_TEST2 = [ -z "`$(CC) "$(PIE_TEST2_FLAGS)"`" ]
-+PIE_FLAGS1 := $(shell $(PIE_TEST1) && $(ECHO) '-fno-PIE -no-pie')
- PIE_FLAGS2 := $(shell $(PIE_TEST2) && $(ECHO) '-fno-PIE -nopie')
--WORKAROUND_CFLAGS += $(PIE_FLAGS) $(PIE_FLAGS2)
-+WORKAROUND_CFLAGS += $(PIE_FLAGS1) $(PIE_FLAGS2)
-+
-+HOST_PIE_TEST1 = [ -z "`$(HOSTCC) "$(PIE_TEST1_FLAGS)"`" ]
-+HOST_PIE_TEST2 = [ -z "`$(HOSTCC) "$(PIE_TEST2_FLAGS)"`" ]
-+HOST_PIE_FLAGS1 := $(shell $(HOST_PIE_TEST1) && $(ECHO) '-fno-PIE -no-pie')
-+HOST_PIE_FLAGS2 := $(shell $(HOST_PIE_TEST2) && $(ECHO) '-fno-PIE -nopie')
-+WORKAROUND_HOST_CFLAGS += $(HOST_PIE_FLAGS1) $(HOST_PIE_FLAGS2)
- endif
- 
- # i386-specific directories containing source files
diff --git a/recipes-extended/ipxe/ipxe_git.bb b/recipes-extended/ipxe/ipxe_git.bb
index 1de0f21..47c5b7a 100644
--- a/recipes-extended/ipxe/ipxe_git.bb
+++ b/recipes-extended/ipxe/ipxe_git.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "binutils-native perl-native syslinux mtools-native cdrtools-native xz"
 LIC_FILES_CHKSUM = "file://../COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "64b4452bca04af433f1c98ab782c0e93cd5c88c0"
+SRCREV = "18dc73d27edb55ebe9cb13c58d59af3da3bd374b"
 PV = "gitr${SRCPV}"
 PR = "r0"
 
-- 
2.17.1


  reply	other threads:[~2020-02-10  5:08 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-10  5:07 [meta-virtualization][PATCH] seabios: upgrade to version 1.13.0 at official URI and switch to python3 Christopher Clark
2020-02-10  5:07 ` Christopher Clark [this message]
2020-02-10  5:07 ` [meta-virtualization][PATCH] linux-yocto/xen.cfg: update Xen KConfig fragment entries Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 00/16] Xen: python3, wic, 4.12.2, tools separation Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 01/16] xen: pass compiler flags via Xen-provided variables Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 02/16] xen: upgrade to 4.12.2 Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 03/16] wic: add support for bootable pcbios partition with Xen hypervisor Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 04/16] xen: package the EFI hypervisor binary /boot/xen.efi Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 05/16] xen: add RDEPENDS for xen-pygrub and xen-python packages Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 06/16] xen: retire Qemu packaging from the Xen recipe Christopher Clark
2020-02-11 21:14   ` Bruce Ashfield
2020-02-10  5:07 ` [meta-virtualization][PATCH 07/16] xen: separate recipes for hypervisor and tools; switch to git as source Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 08/16] xen-tools: move xentrace_setmask into the xentrace package Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 09/16] xen: add seabios to RRECOMMENDS of xen-tools when HVM-enabled Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 10/16] xen-image-minimal: add kernel-module-tun for HVM guest networking Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 11/16] xen-tools: change globbing to fix syntax highlighting Christopher Clark
2020-02-11 21:15   ` Bruce Ashfield
2020-02-11 23:32     ` Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 12/16] xen, xen-tools: update recipes for python3 Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 13/16] xen, xen-tools: separate COMPATIBLE_HOST for hypervisor and tools Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 14/16] xen, xen-tools: remove stubs task and generate 32-bit headers if needed Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 15/16] xen, xen-tools: bug fix to post_patch task Christopher Clark
2020-02-10  5:07 ` [meta-virtualization][PATCH 16/16] xen: add contact to recipe README file Christopher Clark
2020-02-11 21:17   ` Bruce Ashfield
2020-02-11 23:42     ` Christopher Clark
2020-02-12  0:04       ` Bruce Ashfield
     [not found]       ` <15F27ED8B4F696B3.19576@lists.yoctoproject.org>
2020-02-27 22:21         ` Bruce Ashfield

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200210050754.3534-2-christopher.w.clark@gmail.com \
    --to=christopher.w.clark@gmail.com \
    --cc=bruce.ashfield@gmail.com \
    --cc=meta-virtualization@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.