summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 23:43:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-08 10:31:30 +0000
commit3bbaabfaeb847073a2a4ee253f0fd4d0a31256a8 (patch)
tree0af380132f80c4060b688fd37ee63d4930f8be75
parent44ed428c10cc4591868c198fac55c04e3c2e0758 (diff)
downloadpoky-3bbaabfaeb847073a2a4ee253f0fd4d0a31256a8.tar.gz
nfs-utils: create package nfs-utils-mount
Contains just enough to mount and unmount nfs volumes, i.e. the same as nfs-utils-client before commit 39bb7e3 ("nfs-utils: separate package as Debain style"). Drop nfs-utils-client's dependency on bash. It contains two shell scripts, /etc/init.d/nfscommon and /usr/sbin/start-statd, both using /bin/sh. (From OE-Core rev: e21bba827e06f4d6574bbb2b0f453dd0bb627d2c) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index d4b401efa0..eb8e99af8c 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84"
9 9
10# util-linux for libblkid 10# util-linux for libblkid
11DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3 libtirpc" 11DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3 libtirpc"
12RDEPENDS_${PN}-client = "rpcbind bash"
13RDEPENDS_${PN} = "${PN}-client bash" 12RDEPENDS_${PN} = "${PN}-client bash"
14RRECOMMENDS_${PN} = "kernel-module-nfsd" 13RRECOMMENDS_${PN} = "kernel-module-nfsd"
15 14
@@ -71,7 +70,7 @@ PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wr
71PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils" 70PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
72PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 71PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
73 72
74PACKAGES =+ "${PN}-client ${PN}-stats" 73PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
75 74
76CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \ 75CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \
77 ${localstatedir}/lib/nfs/rmtab \ 76 ${localstatedir}/lib/nfs/rmtab \
@@ -79,7 +78,7 @@ CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \
79 ${localstatedir}/lib/nfs/statd/state \ 78 ${localstatedir}/lib/nfs/statd/state \
80 ${sysconfdir}/nfsmount.conf" 79 ${sysconfdir}/nfsmount.conf"
81 80
82FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \ 81FILES_${PN}-client = "${sbindir}/*statd \
83 ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \ 82 ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \
84 ${sbindir}/showmount ${sbindir}/nfsstat \ 83 ${sbindir}/showmount ${sbindir}/nfsstat \
85 ${localstatedir}/lib/nfs \ 84 ${localstatedir}/lib/nfs \
@@ -87,6 +86,10 @@ FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \
87 ${sysconfdir}/nfsmount.conf \ 86 ${sysconfdir}/nfsmount.conf \
88 ${sysconfdir}/init.d/nfscommon \ 87 ${sysconfdir}/init.d/nfscommon \
89 ${systemd_unitdir}/system/nfs-statd.service" 88 ${systemd_unitdir}/system/nfs-statd.service"
89RDEPENDS_${PN}-client = "${PN}-mount rpcbind"
90
91FILES_${PN}-mount = "${base_sbindir}/*mount.nfs*"
92
90FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat" 93FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat"
91RDEPENDS_${PN}-stats = "python3-core" 94RDEPENDS_${PN}-stats = "python3-core"
92 95