summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-03-23 20:37:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-24 16:39:40 +0000
commitf29451282d09dda6e28bc3fec7cce36979d55acd (patch)
treef595b52aae1136e200a49177597c3058263d8c9d
parent2e77b00ed352950298e356fdeb0cb8cbbefafce0 (diff)
downloadpoky-f29451282d09dda6e28bc3fec7cce36979d55acd.tar.gz
nfs-utils: fix do_package error when enable PACKAGECONFIG[nfsv4]
Fixes: ERROR: nfs-utils-2.4.3-r0 do_package: QA Issue: nfs-utils: Files/directories were installed but not shipped in any package: /usr/lib/libnfsidmap/nsswitch.so /usr/lib/libnfsidmap/static.so Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. nfs-utils: 2 installed and not shipped files. [installed-vs-shipped] Add rdep on python3-core for PACKAGECONFIG[nfsv4] to fix: ERROR: nfs-utils-2.4.3-r0 do_package_qa: QA Issue: /usr/sbin/clddb-tool contained in package nfs-utils requires /usr/bin/python3, but no providers found in RDEPENDS_nfs-utils? [file-rdeps] Add rdep on libdevmapper for PACKAGECONFIG[nfsv41] to fix: ERROR: nfs-utils-2.4.3-r0 do_package_qa: QA Issue: /usr/sbin/blkmapd contained in package nfs-utils requires libdevmapper.so.1.02()(64bit), but no providers found in RDEPENDS_nfs-utils? [file-rdeps] (From OE-Core rev: 17b44d51eaf71ae6d04034454dcb68f508b85258) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb
index 42a4ba3dbd..9bdb6f4ae4 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb
@@ -67,9 +67,9 @@ PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
67PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" 67PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
68PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 68PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
69# libdevmapper is available in meta-oe 69# libdevmapper is available in meta-oe
70PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper" 70PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper,libdevmapper"
71# keyutils is available in meta-security 71# keyutils is available in meta-oe
72PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils" 72PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils,python3-core"
73 73
74PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats" 74PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
75 75
@@ -94,7 +94,9 @@ FILES_${PN}-mount = "${base_sbindir}/*mount.nfs*"
94FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat" 94FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat"
95RDEPENDS_${PN}-stats = "python3-core" 95RDEPENDS_${PN}-stats = "python3-core"
96 96
97FILES_${PN} += "${systemd_unitdir}" 97FILES_${PN}-staticdev += "${libdir}/libnfsidmap/*.a"
98
99FILES_${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/"
98 100
99do_configure_prepend() { 101do_configure_prepend() {
100 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ 102 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \