From f29e4f77f704ec75b471d74418797beaccdf4c06 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 12 May 2021 16:26:46 +0800
Subject: [PATCH] ntp: 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: Ica43fab67d4270bfbb418c407a787952d6e22957
---
 .../recipes-support/ntp/ntp_%.bbappend             | 27 ++++++----------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/ntp/ntp_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-support/ntp/ntp_%.bbappend
index 294c84d..72d7472 100644
--- a/meta-starlingx/meta-stx-integ/recipes-support/ntp/ntp_%.bbappend
+++ b/meta-starlingx/meta-stx-integ/recipes-support/ntp/ntp_%.bbappend
@@ -1,31 +1,18 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH0 = "ntp-config"
-DSTSUFX0 = "stx-configfiles"
+inherit stx-metadata
+
+STX_REPO = "config-files"
+STX_SUBPATH = "ntp-config"
 
 LICENSE_append = "& Apache-2.0"
 LIC_FILES_CHKSUM += "\
-	file://stx-configfiles-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 \
+	file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 	"
 
-
-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 -m644 ${WORKDIR}/${DSTSUFX0}/files/ntpd.sysconfig ${D}/${sysconfdir}/sysconfig/ntpd
-        install -D -m644 ${WORKDIR}/${DSTSUFX0}/files/ntp.conf ${D}/${sysconfdir}/ntp.conf
+        install -D -m644 ${STX_METADATA_PATH}/files/ntpd.sysconfig ${D}/${sysconfdir}/sysconfig/ntpd
+        install -D -m644 ${STX_METADATA_PATH}/files/ntp.conf ${D}/${sysconfdir}/ntp.conf
 }
 
 SYSTEMD_AUTO_ENABLE = "disable"
-- 
2.16.6