From 2661f48714f9447aadb27a25726e04daab3cc454 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 3 Jun 2021 15:57:33 +0800
Subject: [PATCH] procps: 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: I1d7fc5593018c8bf31ffdde6f22f0676e6f1ba0d
---
 .../recipes-extended/procps/procps_%.bbappend      | 25 ++++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/meta-starlingx/meta-stx-integ/recipes-extended/procps/procps_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-extended/procps/procps_%.bbappend
index df7e138..687ab6a 100644
--- a/meta-starlingx/meta-stx-integ/recipes-extended/procps/procps_%.bbappend
+++ b/meta-starlingx/meta-stx-integ/recipes-extended/procps/procps_%.bbappend
@@ -1,29 +1,16 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH = "initscripts-config"
-DSTSUFX0 = "stx-configfiles"
+inherit stx-metadata
+
+STX_REPO = "config-files"
+STX_SUBPATH = "initscripts-config"
 
 LICENSE_append = "& Apache-2.0"
 LIC_FILES_CHKSUM += " \
-	file://stx-configfiles-LICENSE;beginline=1;endline=10;md5=5c43895c2c3756125227c74209b8b791 \
-	"
-
-SRC_URI += " \
-	git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH};name=opendev \
+	file://${STX_METADATA_PATH}/centos/initscripts-config.spec;beginline=1;endline=10;md5=5c43895c2c3756125227c74209b8b791 \
 	"
 
-do_unpack_append() {
-    bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
-    cp -pf ${WORKDIR}/${DSTSUFX0}/centos/initscripts-config.spec ${S}/stx-configfiles-LICENSE
-}
-
 do_install_append () {
     install -d  -m 755 ${D}/${sysconfdir}
-
-    install -m  644 ${WORKDIR}/${DSTSUFX0}/files/sysctl.conf ${D}/${sysconfdir}/sysctl.conf
+    install -m  644 ${STX_METADATA_PATH}/files/sysctl.conf ${D}/${sysconfdir}/sysctl.conf
 }
-- 
2.16.6