initscripts: update for stx 5.0 02/8202/1
authorJackie Huang <jackie.huang@windriver.com>
Thu, 3 Jun 2021 07:57:33 +0000 (15:57 +0800)
committerJackie Huang <jackie.huang@windriver.com>
Mon, 9 May 2022 06:55:06 +0000 (14:55 +0800)
* inherit stx-metadata to help install updated files
  from stx 'config-files' repo

Issue-ID: INF-215

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

meta-starlingx/meta-stx-integ/recipes-core/initscripts/initscripts_%.bbappend

index adb5aec..91df974 100644 (file)
@@ -1,17 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH0 = "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/centos/initscripts-config.spec;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=${SUBPATH0};name=opendev \
+       file://${STX_METADATA_PATH}/centos/initscripts-config.spec;beginline=1;endline=10;md5=5c43895c2c3756125227c74209b8b791 \
        "
 
 inherit systemd
@@ -25,7 +21,7 @@ do_install_append () {
     install -d  -m 755 ${D}/${sysconfdir}/init.d
     install -d  -m 755 ${D}/${systemd_system_unitdir}
 
-    install -m  644 ${WORKDIR}/${DSTSUFX0}/files/sysconfig-network.conf ${D}/${sysconfdir}/sysconfig/network
-    install -m  755 ${WORKDIR}/${DSTSUFX0}/files/mountnfs.sh ${D}/${sysconfdir}/init.d/mountnfs
-    install -m  644 ${WORKDIR}/${DSTSUFX0}/files/mountnfs.service ${D}/${systemd_system_unitdir}/mountnfs.service
+    install -m  644 ${STX_METADATA_PATH}/files/sysconfig-network.conf ${D}/${sysconfdir}/sysconfig/network
+    install -m  755 ${STX_METADATA_PATH}/files/mountnfs.sh ${D}/${sysconfdir}/init.d/mountnfs
+    install -m  644 ${STX_METADATA_PATH}/files/mountnfs.service ${D}/${systemd_system_unitdir}/mountnfs.service
 }