[PATCH openbmc v6 01/18] Add pflash parallel build fix patch

[Andrew Jeffery]

On Wed, 2016-06-22 at 19:30 -0500, OpenBMC Patches wrote:
> From: Brad Bishop <bradleyb at fuzziesquirrel.com>
> 
> This resolves https://github.com/openbmc/openbmc/issues/325
> 
> Signed-off-by: Brad Bishop <bradleyb at fuzziesquirrel.com>

Brad's sent this to the skiboot list, maybe we should just hold off
until it's submitted there and drop this patch from the series?

Andrew

> ---
>  .../common/recipes-bsp/pflash/pflash.bb            |  1 +
>  ...-Fix-ARM-build-failure-with-parallel-make.patch | 28
> ++++++++++++++++++++++
>  2 files changed, 29 insertions(+)
>  create mode 100644 meta-openbmc-machines/meta-
> openpower/common/recipes-bsp/pflash/pflash/0007-external-Fix-ARM-
> build-failure-with-parallel-make.patch
> 
> diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-
> bsp/pflash/pflash.bb b/meta-openbmc-machines/meta-
> openpower/common/recipes-bsp/pflash/pflash.bb
> index 496e900..ec43b4f 100644
> --- a/meta-openbmc-machines/meta-openpower/common/recipes-
> bsp/pflash/pflash.bb
> +++ b/meta-openbmc-machines/meta-openpower/common/recipes-
> bsp/pflash/pflash.bb
> @@ -11,6 +11,7 @@ SRC_URI += "file://0003-external-Fix-pflash-install
> -target.patch"
>  SRC_URI += "file://0004-external-Remove-m64-from-shared-CFLAGS-on-
> ARM.patch"
>  SRC_URI += "file://0005-external-Create-shared-rules.mk.patch"
>  SRC_URI += "file://0006-external-Add-dynamically-linked-
> pflash.patch"
> +SRC_URI += "file://0007-external-Fix-ARM-build-failure-with-
> parallel-make.patch"
>  
>  LIC_FILES_CHKSUM =
> "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57"
>  
> diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-
> bsp/pflash/pflash/0007-external-Fix-ARM-build-failure-with-parallel-
> make.patch b/meta-openbmc-machines/meta-openpower/common/recipes-
> bsp/pflash/pflash/0007-external-Fix-ARM-build-failure-with-parallel-
> make.patch
> new file mode 100644
> index 0000000..a9d219c
> --- /dev/null
> +++ b/meta-openbmc-machines/meta-openpower/common/recipes-
> bsp/pflash/pflash/0007-external-Fix-ARM-build-failure-with-parallel-
> make.patch
> @@ -0,0 +1,28 @@
> +From 55749b091414e0cf2691bd8f72c4cb48235b51c3 Mon Sep 17 00:00:00
> 2001
> +From: Brad Bishop <bradleyb at fuzziesquirrel.com>
> +Date: Mon, 20 Jun 2016 20:31:07 -0400
> +Subject: [PATCH] external: Fix ARM build failure with parallel make
> +
> +Arch headers need to be linked in before compiling.
> +
> +Signed-off-by: Brad Bishop <bradleyb at fuzziesquirrel.com>
> +---
> + external/common/rules.mk | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/external/common/rules.mk b/external/common/rules.mk
> +index 5558cd3..bb12fd5 100644
> +--- a/external/common/rules.mk
> ++++ b/external/common/rules.mk
> +@@ -67,7 +67,7 @@ arch_clean:
> + 
> + $(ARCH_SRC): | common
> + 
> +-$(ARCH_OBJS): common-%.o: common/%.c
> ++$(ARCH_OBJS): common-%.o: common/%.c $(ARCH_LINKS)
> + 	$(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
> + 
> + common-arch_flash.o: $(ARCH_OBJS)
> +-- 
> +1.8.3.1
> +
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/openbmc/attachments/20160623/2bd77d1d/attachment.sig>