diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-12-01 15:13:09 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-12-01 21:46:35 -0500 |
commit | ee1c631b92752742d89b311f4774d7017a946d54 (patch) | |
tree | 2aa15fc54ae82e1e842418ea7d687d953bee600e | |
parent | 1d73ebe570177695a8aa0a846e63747a26068aea (diff) | |
download | meta-cloud-services-ee1c631b92752742d89b311f4774d7017a946d54.tar.gz |
memcached: uprev to v1.5.3
Incorporate updates in the recipe found in meta-networking and add
support for systemd.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | meta-openstack/recipes-support/memcached/memcached/configure.patch | 13 | ||||
-rw-r--r-- | meta-openstack/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch | 32 | ||||
-rw-r--r-- | meta-openstack/recipes-support/memcached/memcached/memcached-config.txt | 5 | ||||
-rw-r--r-- | meta-openstack/recipes-support/memcached/memcached_1.5.3.bb (renamed from meta-openstack/recipes-support/memcached/memcached_1.4.17.bb) | 38 |
4 files changed, 69 insertions, 19 deletions
diff --git a/meta-openstack/recipes-support/memcached/memcached/configure.patch b/meta-openstack/recipes-support/memcached/memcached/configure.patch deleted file mode 100644 index 7001a0e..0000000 --- a/meta-openstack/recipes-support/memcached/memcached/configure.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: memcached-1.4.17/configure.ac | ||
2 | =================================================================== | ||
3 | --- memcached-1.4.17.orig/configure.ac 2013-12-20 21:44:49.000000000 +0000 | ||
4 | +++ memcached-1.4.17/configure.ac 2014-07-18 07:17:00.593499483 +0000 | ||
5 | @@ -4,7 +4,7 @@ | ||
6 | AC_INIT(memcached, VERSION_NUMBER, memcached@googlegroups.com) | ||
7 | AC_CANONICAL_SYSTEM | ||
8 | AC_CONFIG_SRCDIR(memcached.c) | ||
9 | -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) | ||
10 | +AM_INIT_AUTOMAKE([foreign]) | ||
11 | AM_CONFIG_HEADER(config.h) | ||
12 | |||
13 | AC_PROG_CC | ||
diff --git a/meta-openstack/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-openstack/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch new file mode 100644 index 0000000..544b840 --- /dev/null +++ b/meta-openstack/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | memcached: add knob to detect whether hugetlbfs are checked | ||
2 | |||
3 | Add knob to detect whether hugetlbfs are checked or not. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
8 | --- | ||
9 | configure.ac | 7 ++++++- | ||
10 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 7f22f21..21691b9 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -314,7 +314,12 @@ fi | ||
17 | dnl ---------------------------------------------------------------------------- | ||
18 | |||
19 | AC_SEARCH_LIBS(umem_cache_create, umem) | ||
20 | -AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) | ||
21 | +AC_ARG_ENABLE(hugetlbfs, | ||
22 | + [AS_HELP_STRING([--enable-hugetlbfs],[Enable hugetlbfs])]) | ||
23 | + | ||
24 | +if test "x$enable_hugetlbfs" = "xyes"; then | ||
25 | + AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) | ||
26 | +fi | ||
27 | |||
28 | AC_HEADER_STDBOOL | ||
29 | AH_BOTTOM([#if HAVE_STDBOOL_H | ||
30 | -- | ||
31 | 1.8.3.4 | ||
32 | |||
diff --git a/meta-openstack/recipes-support/memcached/memcached/memcached-config.txt b/meta-openstack/recipes-support/memcached/memcached/memcached-config.txt new file mode 100644 index 0000000..7e6441e --- /dev/null +++ b/meta-openstack/recipes-support/memcached/memcached/memcached-config.txt | |||
@@ -0,0 +1,5 @@ | |||
1 | PORT="11211" | ||
2 | USER="nobody" | ||
3 | MAXCONN="1024" | ||
4 | CACHESIZE="64" | ||
5 | OPTIONS="" | ||
diff --git a/meta-openstack/recipes-support/memcached/memcached_1.4.17.bb b/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb index 6097693..b2d776b 100644 --- a/meta-openstack/recipes-support/memcached/memcached_1.4.17.bb +++ b/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb | |||
@@ -6,22 +6,33 @@ DESCRIPTION = "\ | |||
6 | of the specific application. Traditionally this has been used in mod_perl \ | 6 | of the specific application. Traditionally this has been used in mod_perl \ |
7 | apps to avoid storing large chunks of data in Apache memory, and to share \ | 7 | apps to avoid storing large chunks of data in Apache memory, and to share \ |
8 | this burden across several machines." | 8 | this burden across several machines." |
9 | 9 | SECTION = "web" | |
10 | HOMEPAGE = "http://memcached.org/" | 10 | HOMEPAGE = "http://memcached.org/" |
11 | LICENSE = "BSD-3-Clause" | 11 | LICENSE = "BSD-3-Clause" |
12 | 12 | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" |
14 | 14 | ||
15 | inherit autotools | 15 | inherit autotools systemd |
16 | 16 | ||
17 | DEPENDS += "libevent" | 17 | DEPENDS += "libevent" |
18 | RDEPENDS_${PN} += "bash perl perl-module-posix perl-module-autoloader perl-module-tie-hash" | 18 | RDEPENDS_${PN} += "\ |
19 | bash \ | ||
20 | perl \ | ||
21 | perl-module-posix \ | ||
22 | perl-module-autoloader \ | ||
23 | perl-module-tie-hash \ | ||
24 | " | ||
19 | 25 | ||
20 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ | 26 | SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ |
21 | file://configure.patch" | 27 | file://memcached-add-hugetlbfs-check.patch \ |
28 | file://memcached-config.txt \ | ||
29 | " | ||
30 | |||
31 | SRC_URI[md5sum] = "263819baf411388b3f72700a3212d4e2" | ||
32 | SRC_URI[sha256sum] = "258cc3ddb7613685465acfd0215f827220a3bbdd167fd2c080632105b2d2f3ce" | ||
22 | 33 | ||
23 | SRC_URI[md5sum] = "46402dfbd7faadf6182283dbbd18b1a6" | 34 | # set the same COMPATIBLE_HOST as libhugetlbfs |
24 | SRC_URI[sha256sum] = "d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458" | 35 | COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux' |
25 | 36 | ||
26 | python __anonymous () { | 37 | python __anonymous () { |
27 | endianness = d.getVar('SITEINFO_ENDIANNESS', True) | 38 | endianness = d.getVar('SITEINFO_ENDIANNESS', True) |
@@ -31,14 +42,29 @@ python __anonymous () { | |||
31 | d.setVar('EXTRA_OECONF', "ac_cv_c_endian=big") | 42 | d.setVar('EXTRA_OECONF', "ac_cv_c_endian=big") |
32 | } | 43 | } |
33 | 44 | ||
45 | PACKAGECONFIG ??= "" | ||
46 | PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" | ||
47 | |||
34 | inherit update-rc.d | 48 | inherit update-rc.d |
35 | 49 | ||
36 | INITSCRIPT_NAME = "memcached" | 50 | INITSCRIPT_NAME = "memcached" |
37 | INITSCRIPT_PARAMS = "defaults" | 51 | INITSCRIPT_PARAMS = "defaults" |
38 | 52 | ||
53 | SYSTEMD_PACKAGES = "memcached" | ||
54 | SYSTEMD_SERVICE_${PN} = "memcached.service" | ||
55 | |||
39 | do_install_append() { | 56 | do_install_append() { |
40 | install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached | 57 | install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached |
58 | |||
41 | mkdir -p ${D}/usr/share/memcached/scripts | 59 | mkdir -p ${D}/usr/share/memcached/scripts |
42 | install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts | 60 | install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts |
43 | install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts | 61 | install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts |
62 | |||
63 | install -d ${D}/${sysconfdir}/default | ||
64 | install -m 600 ${WORKDIR}/memcached-config.txt ${D}/${sysconfdir}/default/memcached | ||
65 | |||
66 | install -d ${D}/${systemd_system_unitdir} | ||
67 | install -m 644 ${S}/scripts/memcached.service ${D}/${systemd_system_unitdir}/. | ||
68 | sed -e "s@^EnvironmentFile=.*@EnvironmentFile=${sysconfdir}/default/memcached@" \ | ||
69 | -i ${D}/${systemd_system_unitdir}/memcached.service | ||
44 | } | 70 | } |