starlingx/meta-starlingx
Code Issues Proposed changes

nfs-utils: update for stx 5.0

Browse Source 
* 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

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I8ff7c835069e088d0687ebc0595a0c813575fb6e
This commit is contained in:
Jackie Huang 2021-06-16 16:25:24 +08:00
parent c4c6a58e2f
commit 4eb31c4ce9
3 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-stx-integ/recipes-connectivity/nfs-utils/files/nfsserver-remove-the-f-option-for-rpc.mountd.patch → meta-stx-flock/stx-config-files/stx-config-files-source/nfs-utils-config-remove-the-f-option-for-rpc.mountd.patch
View File

@ -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>
---

3
meta-stx-flock/stx-config-files/stx-config-files-source_git.bb
View File

@ -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 \
"

52
meta-stx-integ/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
View File

@ -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
}