From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 16 Jun 2021 08:25:24 +0000 (+0800)
Subject: nfs-utils: update for stx 5.0
X-Git-Tag: f-release~84
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0b8515e490ec3eb03acb4160dc29c67d74d9904e;p=pti%2Frtp.git

nfs-utils: 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

* move the patch nfsserver-remove-the-f-option-for-rpc.mountd.patch
  to stx-config-files-source since it's for the source in
  'config-files' repo

Issue-ID: INF-215

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

diff --git a/meta-starlingx/meta-stx-integ/recipes-connectivity/nfs-utils/files/nfsserver-remove-the-f-option-for-rpc.mountd.patch b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source/nfs-utils-config-remove-the-f-option-for-rpc.mountd.patch
similarity index 94%
rename from meta-starlingx/meta-stx-integ/recipes-connectivity/nfs-utils/files/nfsserver-remove-the-f-option-for-rpc.mountd.patch
rename to meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source/nfs-utils-config-remove-the-f-option-for-rpc.mountd.patch
index c9a9231..f97150c 100644
--- a/meta-starlingx/meta-stx-integ/recipes-connectivity/nfs-utils/files/nfsserver-remove-the-f-option-for-rpc.mountd.patch
+++ b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source/nfs-utils-config-remove-the-f-option-for-rpc.mountd.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] nfsserver: remove the -f option for rpc.mountd
 
 The -f option is not supported any more on newer version of nfs-utils.
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [poky-stx specific]
 
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
 ---
diff --git a/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb
index bc79dc5..034967a 100644
--- a/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb
+++ b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb
@@ -7,3 +7,6 @@ STX_REPO = "config-files"
 BRANCH = "r/stx.5.0"
 SRCREV = "237737bbd2488bcae6822dfadc4977d86ea642d7"
 
+SRC_URI += "\
+	file://nfs-utils-config-remove-the-f-option-for-rpc.mountd.patch \
+	"
diff --git a/meta-starlingx/meta-stx-integ/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
index 42eb47f..104e08c 100644
--- a/meta-starlingx/meta-stx-integ/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
+++ b/meta-starlingx/meta-stx-integ/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
@@ -1,34 +1,18 @@
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-SUBPATH0 = "filesystem-scripts"
-DSTSUFX0 = "stx-configfiles"
-SUBPATH1 = "nfs-utils-config"
-DSTSUFX1 = "stx-nfs-utils"
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
+inherit stx-metadata
+
+STX_REPO = "config-files"
+STX_SUBPATH0 = "filesystem-scripts"
+STX_SUBPATH1 = "nfs-utils-config"
+
 LICENSE_append = "& Apache-2.0"
 LIC_FILES_CHKSUM += "\
-	file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-	file://stx-nfs-utils-LICENSE;beginline=1;endline=10;md5=bbfb66ff81fec36fc2b2c9d98e01b1d8 \
+	file://${STX_METADATA_PATH}/${STX_SUBPATH0}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+	file://${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+	file://${STX_METADATA_PATH}/${STX_SUBPATH1}/centos/nfs-utils-config.spec;beginline=1;endline=10;md5=bbfb66ff81fec36fc2b2c9d98e01b1d8 \
 	"
 
-SRC_URI += " \
-        git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
-        git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX1};branch="r/stx.3.0";subpath=${SUBPATH1};name=opendev \
-        file://nfsserver-remove-the-f-option-for-rpc.mountd.patch;patchdir=../${DSTSUFX1};striplevel=2 \
-"
-
-do_unpack_append() {
-    bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
-    cp -pf ${WORKDIR}/${DSTSUFX0}/LICENSE ${S}/stx-configfiles-LICENSE
-    cp -pf ${WORKDIR}/${DSTSUFX0}/filesystem-scripts-1.0/LICENSE ${S}/stx-filesystem-scripts-LICENSE
-    cp -pf ${WORKDIR}/${DSTSUFX1}/centos/nfs-utils-config.spec ${S}/stx-nfs-utils-LICENSE
-}
-
 inherit systemd
 
 PACKAGES =+ "${PN}-config"
@@ -41,7 +25,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
 
 do_install_append() {
 	mv ${D}/${sbindir}/sm-notify ${D}/${sbindir}/nfs-utils-client_sm-notify
-	install -D -m 755 ${WORKDIR}/${DSTSUFX0}/filesystem-scripts-1.0/uexportfs ${D}/${sysconfdir}/init.d/uexportfs 
+	install -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/uexportfs ${D}/${sysconfdir}/init.d/uexportfs
 
 	# install nfs.conf and enable udp proto
 	install -m 0755 ${S}/nfs.conf ${D}${sysconfdir}
@@ -52,23 +36,23 @@ do_install_append() {
 
 	# Libdir here is hardcoded in other scripts.
 	install -d -m 0755 ${D}/usr/lib/ocf/resource.d/platform/
-	install -D -m 755 ${WORKDIR}/${DSTSUFX0}/filesystem-scripts-1.0/nfsserver-mgmt \
+	install -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/nfsserver-mgmt \
 		${D}/usr/lib/ocf/resource.d/platform/nfsserver-mgmt
 	
-	install -p -D -m 755 ${WORKDIR}/${DSTSUFX0}/filesystem-scripts-1.0/nfs-mount ${D}/${bindir}/nfs-mount
-	install -D -m 755 ${WORKDIR}/${DSTSUFX0}/filesystem-scripts-1.0/uexportfs.service \
+	install -p -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/nfs-mount ${D}/${bindir}/nfs-mount
+	install -D -m 755 ${STX_METADATA_PATH}/${STX_SUBPATH0}/filesystem-scripts-1.0/uexportfs.service \
 			${D}/${systemd_system_unitdir}/uexportfs.service
 
 
 	install -d ${D}/${sysconfdir}/init.d
 	install -d ${D}/${systemd_system_unitdir}
 
-	install -m 755 -p -D ${WORKDIR}/${DSTSUFX1}/files/nfscommon   	 ${D}/${sysconfdir}/init.d
-        install -m 644 -p -D ${WORKDIR}/${DSTSUFX1}/files/nfscommon.service  	 ${D}/${systemd_system_unitdir}/
+	install -m 755 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfscommon   	 ${D}/${sysconfdir}/init.d
+        install -m 644 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfscommon.service  	 ${D}/${systemd_system_unitdir}/
 
-        install -m 755 -p -D ${WORKDIR}/${DSTSUFX1}/files/nfsserver            ${D}/${sysconfdir}/init.d
-        install -m 644 -p -D ${WORKDIR}/${DSTSUFX1}/files/nfsserver.service    ${D}/${systemd_system_unitdir}
-        install -m 644 -p -D ${WORKDIR}/${DSTSUFX1}/files/nfsmount.conf        ${D}/${sysconfdir}/nfsmount.conf
+        install -m 755 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfsserver            ${D}/${sysconfdir}/init.d
+        install -m 644 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfsserver.service    ${D}/${systemd_system_unitdir}
+        install -m 644 -p -D ${STX_METADATA_PATH}/${STX_SUBPATH1}/files/nfsmount.conf        ${D}/${sysconfdir}/nfsmount.conf
 
 }