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-webserver/recipes-support | |
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-webserver/recipes-support')
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch | 17 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb (renamed from meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb) | 10 |
3 files changed, 8 insertions, 23 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch deleted file mode 100644 index 51ddeaac2..000000000 --- a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Fix EOF not declared issue, following is the error log. -fcgio.cpp:70:72: error: 'EOF' was not declared in this scope - if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; - -Signed-off-by: Yang Haibo <b40869@freescale.com> ---- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.000000000 +0800 -+++ fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.000000000 +0800 -@@ -22,6 +22,7 @@ - #define DLLAPI __declspec(dllexport) - #endif - -+#include <stdio.h> - #include <limits.h> - #include "fcgio.h" - diff --git a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch index eca694adc..eec9dd7ce 100644 --- a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch +++ b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch @@ -10,8 +10,8 @@ Signed-off-by: Yang Haibo <b40869@freescale.com> dnl to configure the system for the local environment. -AC_INIT --AM_INIT_AUTOMAKE(fcgi, 2.4.0) -+AC_INIT([fcgi], [2.4.0]) +-AM_INIT_AUTOMAKE(fcgi, 2.4.1-SNAP-0910052249) ++AC_INIT([fcgi], [2.4.1-SNAP-0910052249]) +AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER(fcgi_config.h) diff --git a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb index 48c594483..a17e70f09 100644 --- a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb +++ b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb @@ -3,12 +3,14 @@ HOMEPAGE = "http://www.fastcgi.com" LICENSE = "OML" LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" -SRC_URI = "http://fossies.org/linux/www/old/${BP}.tar.gz \ - file://Fix_EOF_not_declared_issue.patch \ +SRCREV = "68100b5b8cb26f04b784778ed19ccef4fe389f57" +PV = "2.4.1+git${SRCPV}" + +SRC_URI = "git://github.com/FastCGI-Archives/fcgi2.git;protocol=https \ file://add_foreign_to_AM_INIT_AUTOMAKE.patch \ " -SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" -SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" + +S = "${WORKDIR}/git" inherit autotools |