diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
| commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
| tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch | |
| parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
| download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz | |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch')
| -rw-r--r-- | meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch deleted file mode 100644 index ccbb24d0d..000000000 --- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 - - |