starlingx/meta-starlingx
Code Issues Proposed changes

memcached: update for stx 5.0

Browse Source 
* inherit stx-metadata to help install updated files
  from stx 'config-files' repo

* remove do_copy_config_files since it's not
  needed after using stx-metadata

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ic5c37417d6d5dfb17375523c455ac10e583fc6e9
This commit is contained in:
Jackie Huang 2021-06-03 15:57:33 +08:00
parent 6d45023003
commit 99d3294f6d
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta-stx-integ/recipes-support/memcached/memcached_%.bbappend
View File

@ -1,17 +1,16 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRCREV_FORMAT = "opendev"
SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
SUBPATH0 = "memcached-custom"
DSTSUFX0 = "stx-configfiles"
inherit stx-metadata
STX_REPO = "config-files"
STX_SUBPATH = "memcached-custom"
LICENSE_append = "& Apache-2.0"
LIC_FILES_CHKSUM += "\
file://stx-configfiles-LICENSE;beginline=1;endline=10;md5=b3063b05db239c326cb7f5c267e0d023 \
file://${STX_METADATA_PATH}/centos/memcached-custom.spec;beginline=1;endline=10;md5=b3063b05db239c326cb7f5c267e0d023 \
"
SRC_URI += " \
git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
file://memcached.sysconfig \
"
@ -22,19 +21,10 @@ USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "-r -g memcached -d /run/memcached -s /sbin/nologin -c 'Memcached daemon' memcached"
GROUPADD_PARAM_${PN} = "-r memcached"
do_unpack_append() {
bb.build.exec_func('do_copy_config_files', d)
}
do_copy_config_files () {
cp -pf ${WORKDIR}/${DSTSUFX0}/centos/memcached-custom.spec ${S}/stx-configfiles-LICENSE
}
do_install_append () {
install -d ${D}${sysconfdir}/sysconfig
install -d ${D}/${sysconfdir}/systemd/system/
install -m 0644 ${WORKDIR}/memcached.sysconfig ${D}${sysconfdir}/sysconfig/memcached
install -m 0644 ${WORKDIR}/${DSTSUFX0}/files/memcached.service \
install -m 0644 ${STX_METADATA_PATH}/files/memcached.service \
${D}/${sysconfdir}/systemd/system/memcached
}