Re: [meta-initramfs][PATCH] kexec-tools-klibc_2.0.2: backport patch to fix build with separate B and S

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 4117 bytes --]

On Wed, Jan 21, 2015 at 12:01:42AM +0100, Andrea Adami wrote:
> Catching up with oe-core commit 5fccfd0f0a9dd4dca96389f5d856d3fab21745e2
> ( kexec-tools: separate B and S) which removed autotools-brokensep for a newer
> version.
> 
> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
> ---
>  .../fix-out-of-tree-build.patch                    | 54 ++++++++++++++++++++++
>  .../kexec/kexec-tools-klibc_2.0.2.bb               |  2 +
>  2 files changed, 56 insertions(+)
>  create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch
> 
> diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch
> new file mode 100644
> index 0000000..ccbb24d
> --- /dev/null
> +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch
> @@ -0,0 +1,54 @@
> +From 37737527725e465833be649101c4a6f8352c5d5e Mon Sep 17 00:00:00 2001
> +From: Tyler Hall <tylerwhall@gmail.com>
> +Date: Tue, 7 Feb 2012 18:50:05 -0500
> +Subject: Fix out-of-tree build
> +
> +Use automatic variables for prerequisites when copying man pages and
> +include a makefile relative to $(srcdir).
> +
> +Backported to 2.0.2-klibc
> +
> +Signed-off-by: Tyler Hall <tylerwhall@gmail.com>
> +Signed-off-by: Simon Horman <horms@verge.net.au>
> +
> +diff --git a/kdump/Makefile b/kdump/Makefile
> +index 1e2b72c..5dfa928 100644
> +--- a/kdump/Makefile
> ++++ b/kdump/Makefile
> +@@ -22,7 +22,7 @@ $(KDUMP): $(KDUMP_OBJS)
> + 
> + $(KDUMP_MANPAGE): kdump/kdump.8
> + 	$(MKDIR) -p     $(MANDIR)/man8
> +-	cp kdump/kdump.8 $(KDUMP_MANPAGE)
> ++	cp $^ $(KDUMP_MANPAGE)
> + echo::
> + 	@echo "KDUMP_SRCS $(KDUMP_SRCS)"
> + 	@echo "KDUMP_DEPS $(KDUMP_DEPS)"
> +diff --git a/kexec/Makefile b/kexec/Makefile
> +index 2137cab..8c815b5 100644
> +--- a/kexec/Makefile
> ++++ b/kexec/Makefile
> +@@ -82,7 +82,7 @@ $(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include
> + 
> + $(KEXEC_MANPAGE): kexec/kexec.8
> + 	@$(MKDIR) -p     $(MANDIR)/man8
> +-	cp kexec/kexec.8 $(KEXEC_MANPAGE)
> ++	cp $^ $(KEXEC_MANPAGE)
> + echo::
> + 	@echo "KEXEC_SRCS $(KEXEC_SRCS)"
> + 	@echo "KEXEC_DEPS $(KEXEC_DEPS)"
> +diff --git a/kexec/arch/ppc/Makefile b/kexec/arch/ppc/Makefile
> +index 3dba7cf..41242a5 100644
> +--- a/kexec/arch/ppc/Makefile
> ++++ b/kexec/arch/ppc/Makefile
> +@@ -1,7 +1,7 @@
> + #
> + # kexec ppc (linux booting linux)
> + #
> +-include kexec/arch/ppc/libfdt/Makefile.libfdt
> ++include $(srcdir)/kexec/arch/ppc/libfdt/Makefile.libfdt
> + 
> + ppc_KEXEC_SRCS =  kexec/arch/ppc/kexec-ppc.c
> + ppc_KEXEC_SRCS += kexec/arch/ppc/kexec-elf-ppc.c
> +
> +
> diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
> index b1b6ffc..3c829fa 100644
> --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
> +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
> @@ -4,6 +4,7 @@ SUMMARY = "Kexec tools, statically compiled against klibc"
>  SRC_URI[md5sum] = "92eff93b097475b7767f8c98df84408a"
>  SRC_URI[sha256sum] = "09e180ff36dee087182cdc939ba6c6917b6adbb5fc12d589f31fd3659b6471f2"
>  
> +#inherit autotools-brokensep

I've removed this comment when cherry-picking to master-next.

>  inherit klibc
>  
>  FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
> @@ -17,6 +18,7 @@ SRC_URI += " \
>              file://purgatory_string.patch \
>              file://sha256.patch \
>              file://sysconf_nrprocessors.patch \
> +            file://fix-out-of-tree-build.patch \
>              "
>  
>  SRC_URI_append_arm = " file://arm_crashdump.patch"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]