aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-06-14 11:20:41 +0800
committerKhem Raj <raj.khem@gmail.com>2019-06-15 16:46:50 -0700
commit60be27c39b329263f03c76150b32541ed8972f87 (patch)
tree8c181e9e35af7d95be6989387a4c4a36197ffda8
parent9e58f66e355e9f3d51e9a9808be767e829e8a23d (diff)
downloadmeta-openembedded-contrib-60be27c39b329263f03c76150b32541ed8972f87.tar.gz
meta-openembedded-contrib-60be27c39b329263f03c76150b32541ed8972f87.tar.bz2
meta-openembedded-contrib-60be27c39b329263f03c76150b32541ed8972f87.zip
fcgi: upgrade 2.4.1+git -> 2.4.2
Remove add_foreign_to_AM_INIT_AUTOMAKE.patch as the issue had been fixed upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch18
-rw-r--r--meta-webserver/recipes-support/fcgi/fcgi_git.bb7
2 files changed, 3 insertions, 22 deletions
diff --git a/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch
deleted file mode 100644
index eec9dd7ce0..0000000000
--- a/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-use automake options "foreign" to set the strictness as appropriate
-
-Signed-off-by: Yang Haibo <b40869@freescale.com>
---- fcgi-ori/configure.in 2014-08-05 14:58:35.000000000 +0800
-+++ fcgi-2.4.0/configure.in 2014-08-05 14:59:08.000000000 +0800
-@@ -4,8 +4,8 @@
- dnl generate the file "configure", which is run during the build
- dnl to configure the system for the local environment.
-
--AC_INIT
--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-webserver/recipes-support/fcgi/fcgi_git.bb b/meta-webserver/recipes-support/fcgi/fcgi_git.bb
index a17e70f09e..6df58ad3c4 100644
--- a/meta-webserver/recipes-support/fcgi/fcgi_git.bb
+++ b/meta-webserver/recipes-support/fcgi/fcgi_git.bb
@@ -3,12 +3,11 @@ HOMEPAGE = "http://www.fastcgi.com"
LICENSE = "OML"
LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a"
-SRCREV = "68100b5b8cb26f04b784778ed19ccef4fe389f57"
-PV = "2.4.1+git${SRCPV}"
+SRCREV = "382aa2b0d53a87c27f2f647dfaf670375ba0b85f"
+PV = "2.4.2"
SRC_URI = "git://github.com/FastCGI-Archives/fcgi2.git;protocol=https \
- file://add_foreign_to_AM_INIT_AUTOMAKE.patch \
-"
+ "
S = "${WORKDIR}/git"