starlingx/meta-starlingx
Code Issues Proposed changes

nfs-utils: split stx config files into nfs-utils-config

Browse Source 
The stx systemd config files need to be enabled for duplex,
while keeping the default services from nfs-utils disable,
so split them into sub-package nfs-utils-config, and set
SYSTEMD_AUTO_ENABLE for each package accordingly.

And this also fix two typos.

Story: 2008204
Task: 40988

Change-Id: I71982164b0c93ff0f5eb541c7bc2cb957b09af70
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
This commit is contained in:
Jackie Huang 2020-10-10 17:29:47 +08:00
parent 21328eaacf
commit 4eca1dddb0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-stx-distro/recipes-core/packagegroups/packagegroup-stx.bb
View File

@ -69,6 +69,7 @@ RDEPENDS_packagegroup-stx-config-files = " \
openvswitch \
systemd \
nfs-utils \
nfs-utils-config \
iptables \
logrotate \
mlx4-init \

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

@ -29,9 +29,13 @@ do_copy_config_files () {
}
inherit systemd
SYSTEMD_PACKAGES += "${PN}"
SYSETMD_SERVICE_${PN}_append = "uexport.service nfscommon.service"
PACKAGES =+ "${PN}-config"
SYSTEMD_PACKAGES += "${PN}-config"
SYSTEMD_SERVICE_${PN}-config = "uexportfs.service nfscommon.service nfsserver.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
SYSTEMD_AUTO_ENABLE_${PN}-config = "enable"
DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
do_install_append() {
@ -64,4 +68,10 @@ do_install_append() {
}
FILES_${PN}-config = "\
${systemd_system_unitdir}/nfscommon.service \
${systemd_system_unitdir}/nfsserver.service \
${systemd_system_unitdir}/uexportfs.service \
${sysconfdir}/nfsmount.conf \
"
FILES_${PN}_append = " usr/lib/ocf/resource.d"