diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2015-01-21 00:01:42 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-28 09:51:53 +0100 |
| commit | a433accf63eaaa3f0ffbb1a7346d90f5357b207f (patch) | |
| tree | ede9b93112a9f2af9a7fc8ec53e5e5565c494913 | |
| parent | aa9bc12fdbdb6bb406ff1c6d365340d0ec817432 (diff) | |
| download | meta-openembedded-a433accf63eaaa3f0ffbb1a7346d90f5357b207f.tar.gz | |
kexec-tools-klibc_2.0.2: backport patch to fix build with separate B and S
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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch | 54 | ||||
| -rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb | 1 |
2 files changed, 55 insertions, 0 deletions
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 0000000000..ccbb24d0db --- /dev/null +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | From 37737527725e465833be649101c4a6f8352c5d5e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tyler Hall <tylerwhall@gmail.com> | ||
| 3 | Date: Tue, 7 Feb 2012 18:50:05 -0500 | ||
| 4 | Subject: Fix out-of-tree build | ||
| 5 | |||
| 6 | Use automatic variables for prerequisites when copying man pages and | ||
| 7 | include a makefile relative to $(srcdir). | ||
| 8 | |||
| 9 | Backported to 2.0.2-klibc | ||
| 10 | |||
| 11 | Signed-off-by: Tyler Hall <tylerwhall@gmail.com> | ||
| 12 | Signed-off-by: Simon Horman <horms@verge.net.au> | ||
| 13 | |||
| 14 | diff --git a/kdump/Makefile b/kdump/Makefile | ||
| 15 | index 1e2b72c..5dfa928 100644 | ||
| 16 | --- a/kdump/Makefile | ||
| 17 | +++ b/kdump/Makefile | ||
| 18 | @@ -22,7 +22,7 @@ $(KDUMP): $(KDUMP_OBJS) | ||
| 19 | |||
| 20 | $(KDUMP_MANPAGE): kdump/kdump.8 | ||
| 21 | $(MKDIR) -p $(MANDIR)/man8 | ||
| 22 | - cp kdump/kdump.8 $(KDUMP_MANPAGE) | ||
| 23 | + cp $^ $(KDUMP_MANPAGE) | ||
| 24 | echo:: | ||
| 25 | @echo "KDUMP_SRCS $(KDUMP_SRCS)" | ||
| 26 | @echo "KDUMP_DEPS $(KDUMP_DEPS)" | ||
| 27 | diff --git a/kexec/Makefile b/kexec/Makefile | ||
| 28 | index 2137cab..8c815b5 100644 | ||
| 29 | --- a/kexec/Makefile | ||
| 30 | +++ b/kexec/Makefile | ||
| 31 | @@ -82,7 +82,7 @@ $(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include | ||
| 32 | |||
| 33 | $(KEXEC_MANPAGE): kexec/kexec.8 | ||
| 34 | @$(MKDIR) -p $(MANDIR)/man8 | ||
| 35 | - cp kexec/kexec.8 $(KEXEC_MANPAGE) | ||
| 36 | + cp $^ $(KEXEC_MANPAGE) | ||
| 37 | echo:: | ||
| 38 | @echo "KEXEC_SRCS $(KEXEC_SRCS)" | ||
| 39 | @echo "KEXEC_DEPS $(KEXEC_DEPS)" | ||
| 40 | diff --git a/kexec/arch/ppc/Makefile b/kexec/arch/ppc/Makefile | ||
| 41 | index 3dba7cf..41242a5 100644 | ||
| 42 | --- a/kexec/arch/ppc/Makefile | ||
| 43 | +++ b/kexec/arch/ppc/Makefile | ||
| 44 | @@ -1,7 +1,7 @@ | ||
| 45 | # | ||
| 46 | # kexec ppc (linux booting linux) | ||
| 47 | # | ||
| 48 | -include kexec/arch/ppc/libfdt/Makefile.libfdt | ||
| 49 | +include $(srcdir)/kexec/arch/ppc/libfdt/Makefile.libfdt | ||
| 50 | |||
| 51 | ppc_KEXEC_SRCS = kexec/arch/ppc/kexec-ppc.c | ||
| 52 | ppc_KEXEC_SRCS += kexec/arch/ppc/kexec-elf-ppc.c | ||
| 53 | |||
| 54 | |||
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 b1b6ffca49..d5b7bbe9c7 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 | |||
| @@ -17,6 +17,7 @@ SRC_URI += " \ | |||
| 17 | file://purgatory_string.patch \ | 17 | file://purgatory_string.patch \ |
| 18 | file://sha256.patch \ | 18 | file://sha256.patch \ |
| 19 | file://sysconf_nrprocessors.patch \ | 19 | file://sysconf_nrprocessors.patch \ |
| 20 | file://fix-out-of-tree-build.patch \ | ||
| 20 | " | 21 | " |
| 21 | 22 | ||
| 22 | SRC_URI_append_arm = " file://arm_crashdump.patch" | 23 | SRC_URI_append_arm = " file://arm_crashdump.patch" |
