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-support/re2c | |
| 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-support/re2c')
| -rw-r--r-- | poky/meta/recipes-support/re2c/re2c/mkdir.patch | 36 | ||||
| -rw-r--r-- | poky/meta/recipes-support/re2c/re2c_1.0.1.bb (renamed from poky/meta/recipes-support/re2c/re2c_0.16.bb) | 7 |
2 files changed, 3 insertions, 40 deletions
diff --git a/poky/meta/recipes-support/re2c/re2c/mkdir.patch b/poky/meta/recipes-support/re2c/re2c/mkdir.patch deleted file mode 100644 index d59f01b36..000000000 --- a/poky/meta/recipes-support/re2c/re2c/mkdir.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Submitted (https://github.com/skvadrik/re2c/pull/191) -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From bccc10c60523f88c8f81413151cdcd612eb16198 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Mon, 31 Jul 2017 15:43:41 +0100 -Subject: [PATCH] Makefile.am: create target directory before writing into it - -In some situations src/parse/ may not exist before a file is copied into the -directory. Ensure that this doesn't happen by creating the directory first. ---- - re2c/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/re2c/Makefile.am b/re2c/Makefile.am -index 3b3b2c5e..0707fc5a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -187,6 +187,7 @@ CLEANFILES = \ - $(DOC) - - $(AUTOGEN_PARSER): $(CUSTOM_PARSER) -+ $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN) if test $(BISON) = "no"; \ - then \ - cp $(top_srcdir)/$(BOOTSTRAP_PARSER) $@ && \ -@@ -211,6 +212,7 @@ $(BOOTSTRAP_PARSER): $(CUSTOM_PARSER) - $(top_srcdir)/$(CUSTOM_PARSER); - - .re.cc: -+ $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN) if test -x $(RE2C); \ - then \ - $(top_builddir)/$(RE2C) $(RE2CFLAGS) -o $@ $< && \ --- -2.11.0 diff --git a/poky/meta/recipes-support/re2c/re2c_0.16.bb b/poky/meta/recipes-support/re2c/re2c_1.0.1.bb index 50dd7b7d2..4ed8d257a 100644 --- a/poky/meta/recipes-support/re2c/re2c_0.16.bb +++ b/poky/meta/recipes-support/re2c/re2c_1.0.1.bb @@ -5,10 +5,9 @@ SECTION = "devel" LICENSE = "PD" LIC_FILES_CHKSUM = "file://README;beginline=146;md5=881056c9add17f8019ccd8c382ba963a" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://mkdir.patch" -SRC_URI[md5sum] = "3bf508fabd52ed7334647d0ccb956e8d" -SRC_URI[sha256sum] = "48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "e2c6cf52fc6a21595f21bc82db5324f8" +SRC_URI[sha256sum] = "605058d18a00e01bfc32aebf83af35ed5b13180b4e9f279c90843afab2c66c7c" BBCLASSEXTEND = "native" |