redis: improve conf file install and stylize
cover redis: improve conf file install and stylize
This set fixes file permissions used to install the default configuration file. It also mark it as configuration file for packaging by adding to CONFFILES. Some recipe restyling was also applied.
Feel free to squash individual patches if more appropriate or just let me know and I will respin.
Andrea Galbusera (3):
redis: fix configuration file permissions
redis: add redis.conf to CONFFILES
redis: stylize
meta-oe/recipes-extended/redis/redis_3.0.2.bb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/3 redis: fix configuration file permissions
use 0644 instead of 0755 to install configuration file
Signed-off-by Andrea Galbusera <[email protected]>
--- meta-oe/recipes-extended/redis/redis_3.0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/redis/redis_3.0.2.bb +1 -1
@@ -27,7 +27,7 @@ do_install() { oe_runmake install install -d ${D}/${sysconfdir}/redis - install -m 0755 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
Signature · 1 line
1.9.1
PATCH 2/3 redis: add redis.conf to CONFFILES
In reply to Andrea GalbuseraSigned-off-by Andrea Galbusera <[email protected]>
--- meta-oe/recipes-extended/redis/redis_3.0.2.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-extended/redis/redis_3.0.2.bb +1 -0
@@ -35,3 +35,4 @@ do_install() { install -d ${D}/var/lib/redis/ } +CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf"
Signature · 1 line
1.9.1
PATCH 3/3 redis: stylize
In reply to Andrea Galbusera* remove trailing whitespaces
* run through oe-stylize
Signed-off-by Andrea Galbusera <[email protected]>
--- meta-oe/recipes-extended/redis/redis_3.0.2.bb | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
meta-oe/recipes-extended/redis/redis_3.0.2.bb +8 -12
@@ -3,9 +3,9 @@ DESCRIPTION = "Redis is an open source, advanced key-value store." HOMEPAGE = "http://redis.io" SECTION = "libs" LICENSE = "BSD" -LIC_FILES_CHKSUM="file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" - +LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" DEPENDS = "" + SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://hiredis-use-default-CC-if-it-is-set.patch \ file://lua-update-Makefile-to-use-environment-build-setting.patch \
@@ -13,26 +13,22 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://redis.conf \ file://init-redis-server \ " - -inherit autotools-brokensep update-rc.d - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - SRC_URI[md5sum] = "87be8867447f62524b584813e5a7bd14" SRC_URI[sha256sum] = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f" +inherit autotools-brokensep update-rc.d + do_install() { export PREFIX=${D}/${prefix} oe_runmake install - install -d ${D}/${sysconfdir}/redis install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - - install -d ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ } CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87"
Signature · 1 line
1.9.1