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

logrotate: 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: I65e4562de4733b3acbb66cbfe7608f97de72f93f
---

diff --git a/meta-starlingx/meta-stx-integ/recipes-extended/logrotate/logrotate_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-extended/logrotate/logrotate_%.bbappend
index faf2b7f..53a8232 100644
--- a/meta-starlingx/meta-stx-integ/recipes-extended/logrotate/logrotate_%.bbappend
+++ b/meta-starlingx/meta-stx-integ/recipes-extended/logrotate/logrotate_%.bbappend
@@ -1,31 +1,19 @@
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH0 = "logrotate-config"
-DSTSUFX0 = "stx-configfiles"
+inherit stx-metadata
+
+STX_REPO = "config-files"
+STX_SUBPATH = "logrotate-config"
 
 LICENSE_append = "& Apache-2.0"
 LIC_FILES_CHKSUM += "\
-	file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+	file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 	"
 
-SRC_URI += " \
-	git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
-"
-
 RDEPENDS_${PN}_append = " cronie"
 
-do_unpack_append() {
-    bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
-    cp -pf ${WORKDIR}/${DSTSUFX0}/files/LICENSE ${S}/stx-configfiles-LICENSE
-}
-
 do_install_append() {
     install -d -m0755 ${D}/${sysconfdir}/cron.d/
-    install -m 644 ${WORKDIR}/${DSTSUFX0}/files/logrotate-cron.d ${D}/${sysconfdir}/cron.d/logrotate
-    install -m 644 ${WORKDIR}/${DSTSUFX0}/files/logrotate.conf ${D}/${sysconfdir}/logrotate.conf
+    install -m 644 ${STX_METADATA_PATH}/files/logrotate-cron.d ${D}/${sysconfdir}/cron.d/logrotate
+    install -m 644 ${STX_METADATA_PATH}/files/logrotate.conf ${D}/${sysconfdir}/logrotate.conf
     #mv ${D}/${sysconfdir}/cron.daily/logrotate ${D}/${sysconfdir}/logrotate.cron
     #chmod 700 ${D}/${sysconfdir}/logrotate.cron
 }