diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-26 11:58:10 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:19:03 +0200 |
commit | c155bd03fd4d4fd7f73202ef70833e17d3adf43b (patch) | |
tree | 861cf3cc2c515933968499ff740f9bc20fa67626 /meta-webserver/recipes-httpd | |
parent | 18835b0a5fdeeadcba1f9b6b2da67153ed6ac7b2 (diff) | |
download | meta-openembedded-c155bd03fd4d4fd7f73202ef70833e17d3adf43b.tar.gz |
cherokee: Upgrade to 1.2.104+git
Use git fetcher to use tip of tree, the tree does not
get frequent fixes. Its not disruptive to use git fetcher
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r-- | meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch | 30 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch | 27 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/cherokee/cherokee_git.bb (renamed from meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb) | 16 |
3 files changed, 66 insertions, 7 deletions
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch new file mode 100644 index 000000000..f3be7c6e5 --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 4591b5b40d66c19edc73b951ad091dac639454c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Jul 2017 16:00:34 -0700 | ||
4 | Subject: [PATCH] configure.ac: Add foreign to AM_INIT_AUTOMAKE | ||
5 | |||
6 | Fixes errors like | ||
7 | | Makefile.am: error: required file './README' not found | ||
8 | | Makefile.am: error: required file './ChangeLog' not found | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | configure.ac | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index d6298f27..98cab791 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -32,7 +32,7 @@ dnl Init autoconf and automake | ||
20 | AC_INIT([cherokee], [cherokee_version], [http://bugs.cherokee-project.com/], [cherokee]) | ||
21 | AC_CONFIG_SRCDIR([cherokee/server.c]) | ||
22 | AC_CONFIG_MACRO_DIR([m4]) | ||
23 | -AM_INIT_AUTOMAKE([no-define]) | ||
24 | +AM_INIT_AUTOMAKE([no-define foreign]) | ||
25 | |||
26 | dnl Define version | ||
27 | AC_DEFINE(PACKAGE_MAJOR_VERSION, "cherokee_major_version", [Version string]) | ||
28 | -- | ||
29 | 2.13.3 | ||
30 | |||
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch new file mode 100644 index 000000000..d4c0b6e8c --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From e9ae3231ec188df801fe51aa95d6afec2e52db58 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Jul 2017 16:14:19 -0700 | ||
4 | Subject: [PATCH] make: Do not build po files | ||
5 | |||
6 | Target fails to build | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Makefile.am | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/Makefile.am b/Makefile.am | ||
14 | index f01278c3..eb864c36 100644 | ||
15 | --- a/Makefile.am | ||
16 | +++ b/Makefile.am | ||
17 | @@ -1,6 +1,6 @@ | ||
18 | ## Cherokee: Makefile.am -*- makefile -*- | ||
19 | |||
20 | -SUBDIRS = po m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer | ||
21 | +SUBDIRS = m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer | ||
22 | SUFFIXES = .sample.pre .sample .h.pre .h .xml.pre .xml | ||
23 | ACLOCAL_AMFLAGS = -I m4 | ||
24 | |||
25 | -- | ||
26 | 2.13.3 | ||
27 | |||
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index ba39f97e9..3f7eae4c1 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb | |||
@@ -5,19 +5,21 @@ SECTION = "network" | |||
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
7 | 7 | ||
8 | PR = "r9" | 8 | DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
9 | 9 | ||
10 | DEPENDS = "libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 10 | SRCREV = "75f041e2255e6dd0692db2f14611c2647dbe8425" |
11 | 11 | PV = "1.2.104+git${SRCPV}" | |
12 | SRC_URI = "http://mirror.aarnet.edu.au/pub/${BPN}/1.2/${PV}/${BP}.tar.gz \ | 12 | SRC_URI = "git://github.com/cherokee/webserver \ |
13 | file://cherokee.init \ | 13 | file://cherokee.init \ |
14 | file://cherokee.service \ | 14 | file://cherokee.service \ |
15 | file://cherokee-install-configured.py-once.patch \ | 15 | file://cherokee-install-configured.py-once.patch \ |
16 | file://0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch \ | ||
17 | file://0001-make-Do-not-build-po-files.patch \ | ||
16 | " | 18 | " |
17 | SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb" | ||
18 | SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d" | ||
19 | 19 | ||
20 | inherit autotools pkgconfig binconfig update-rc.d systemd | 20 | S = "${WORKDIR}/git" |
21 | |||
22 | inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd pythonnative | ||
21 | 23 | ||
22 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 24 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
23 | PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" | 25 | PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" |