From 357599a4a740383cc7932d63375225122a382eec 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] sudo: 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: I57af08c1e512f1edd8e269bd25bfe33c7a030562
---
 .../recipes-extended/sudo/sudo_%.bbappend           | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend
index 94dd1a2..d2aa371 100644
--- a/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend
+++ b/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend
@@ -5,18 +5,17 @@ DEPENDS += " \
 	libgcrypt \
 	"
 
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH0 = "sudo-config"
-DSTSUFX0 = "stx-configfiles"
+inherit stx-metadata
+
+STX_REPO = "config-files"
+STX_SUBPATH = "sudo-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 \
 	file://sudo-1.6.7p5-strip.patch \
 	file://sudo-1.7.2p1-envdebug.patch \
 	file://sudo-1.8.23-sudoldapconfman.patch \
@@ -39,18 +38,10 @@ EXTRA_OECONF += " \
 	--with-sssd \
 	"
 
-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 -m755 -d ${D}/${sysconfdir}/openldap/schema
 	install -m644 ${S}/doc/schema.OpenLDAP  ${D}/${sysconfdir}/openldap/schema/sudo.schema
-	install -m 440 ${WORKDIR}/${DSTSUFX0}/files/sysadmin.sudo  ${D}/${sysconfdir}/sudoers.d/sysadmin
+	install -m 440 ${STX_METADATA_PATH}/files/sysadmin.sudo  ${D}/${sysconfdir}/sudoers.d/sysadmin
 }
 
 # This means sudo package only owns files
-- 
2.16.6