From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 3 Jun 2021 07:57:33 +0000 (+0800)
Subject: memcached: update for stx 5.0
X-Git-Tag: f-release~75
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=15c1ae8a7ca475f19eaa33e166c2a8ee63642467;p=pti%2Frtp.git

memcached: update for stx 5.0

* 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

Issue-ID: INF-215

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Idce60089c789e87858f915287c52eebf1731fd33
---

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/memcached/memcached_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-support/memcached/memcached_%.bbappend
index cede4cf..20a88ca 100644
--- a/meta-starlingx/meta-stx-integ/recipes-support/memcached/memcached_%.bbappend
+++ b/meta-starlingx/meta-stx-integ/recipes-support/memcached/memcached_%.bbappend
@@ -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
 }