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 /poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.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 'poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch')
-rw-r--r-- | poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch b/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch index 3f01c69b2a..68c2371fb3 100644 --- a/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch +++ b/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch @@ -1,4 +1,4 @@ -From 71bd0082c6edcf73f054a8a4fa34bd8dd4de7cd7 Mon Sep 17 00:00:00 2001 +From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Wed, 16 Sep 2015 19:45:40 -0700 Subject: [PATCH] dev.mk.in: fix file name too long @@ -10,14 +10,15 @@ to fix the problem. Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + --- - dev.mk.in | 2 +- + dev.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: ccache-3.3.4/dev.mk.in -=================================================================== ---- ccache-3.3.4.orig/dev.mk.in -+++ ccache-3.3.4/dev.mk.in +diff --git a/dev.mk.in b/dev.mk.in +index 91b0a57..583ade0 100644 +--- a/dev.mk.in ++++ b/dev.mk.in @@ -1,7 +1,7 @@ # GNU make syntax reigns in this file. @@ -25,5 +26,5 @@ Index: ccache-3.3.4/dev.mk.in -all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d +all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d + A2X = a2x ASCIIDOC = asciidoc - CPPCHECK = cppcheck |