diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-connectivity/nfs-utils | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb index 5500a9249f..495ce4e542 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb | |||
@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" | |||
9 | 9 | ||
10 | # util-linux for libblkid | 10 | # util-linux for libblkid |
11 | DEPENDS = "libcap libevent util-linux sqlite3 libtirpc" | 11 | DEPENDS = "libcap libevent util-linux sqlite3 libtirpc" |
12 | RDEPENDS_${PN} = "${PN}-client" | 12 | RDEPENDS:${PN} = "${PN}-client" |
13 | RRECOMMENDS_${PN} = "kernel-module-nfsd" | 13 | RRECOMMENDS:${PN} = "kernel-module-nfsd" |
14 | 14 | ||
15 | inherit useradd | 15 | inherit useradd |
16 | 16 | ||
17 | USERADD_PACKAGES = "${PN}-client" | 17 | USERADD_PACKAGES = "${PN}-client" |
18 | USERADD_PARAM_${PN}-client = "--system --home-dir /var/lib/nfs \ | 18 | USERADD_PARAM:${PN}-client = "--system --home-dir /var/lib/nfs \ |
19 | --shell /bin/false --user-group rpcuser" | 19 | --shell /bin/false --user-group rpcuser" |
20 | 20 | ||
21 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ | 21 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ |
@@ -39,14 +39,14 @@ SRC_URI[sha256sum] = "51997d94e4c8bcef5456dd36a9ccc38e231207c4e9b6a9a2c108841e6a | |||
39 | INITSCRIPT_PACKAGES = "${PN} ${PN}-client" | 39 | INITSCRIPT_PACKAGES = "${PN} ${PN}-client" |
40 | INITSCRIPT_NAME = "nfsserver" | 40 | INITSCRIPT_NAME = "nfsserver" |
41 | INITSCRIPT_PARAMS = "defaults" | 41 | INITSCRIPT_PARAMS = "defaults" |
42 | INITSCRIPT_NAME_${PN}-client = "nfscommon" | 42 | INITSCRIPT_NAME:${PN}-client = "nfscommon" |
43 | INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21" | 43 | INITSCRIPT_PARAMS:${PN}-client = "defaults 19 21" |
44 | 44 | ||
45 | inherit autotools-brokensep update-rc.d systemd pkgconfig | 45 | inherit autotools-brokensep update-rc.d systemd pkgconfig |
46 | 46 | ||
47 | SYSTEMD_PACKAGES = "${PN} ${PN}-client" | 47 | SYSTEMD_PACKAGES = "${PN} ${PN}-client" |
48 | SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service" | 48 | SYSTEMD_SERVICE:${PN} = "nfs-server.service nfs-mountd.service" |
49 | SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service" | 49 | SYSTEMD_SERVICE:${PN}-client = "nfs-statd.service" |
50 | 50 | ||
51 | # --enable-uuid is need for cross-compiling | 51 | # --enable-uuid is need for cross-compiling |
52 | EXTRA_OECONF = "--with-statduser=rpcuser \ | 52 | EXTRA_OECONF = "--with-statduser=rpcuser \ |
@@ -62,7 +62,7 @@ EXTRA_OECONF = "--with-statduser=rpcuser \ | |||
62 | PACKAGECONFIG ??= "tcp-wrappers \ | 62 | PACKAGECONFIG ??= "tcp-wrappers \ |
63 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | 63 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
64 | " | 64 | " |
65 | PACKAGECONFIG_remove_libc-musl = "tcp-wrappers" | 65 | PACKAGECONFIG:remove:libc-musl = "tcp-wrappers" |
66 | PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" | 66 | PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" |
67 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 67 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
68 | # libdevmapper is available in meta-oe | 68 | # libdevmapper is available in meta-oe |
@@ -72,13 +72,13 @@ PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils,python3-core" | |||
72 | 72 | ||
73 | PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats" | 73 | PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats" |
74 | 74 | ||
75 | CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \ | 75 | CONFFILES:${PN}-client += "${localstatedir}/lib/nfs/etab \ |
76 | ${localstatedir}/lib/nfs/rmtab \ | 76 | ${localstatedir}/lib/nfs/rmtab \ |
77 | ${localstatedir}/lib/nfs/xtab \ | 77 | ${localstatedir}/lib/nfs/xtab \ |
78 | ${localstatedir}/lib/nfs/statd/state \ | 78 | ${localstatedir}/lib/nfs/statd/state \ |
79 | ${sysconfdir}/nfsmount.conf" | 79 | ${sysconfdir}/nfsmount.conf" |
80 | 80 | ||
81 | FILES_${PN}-client = "${sbindir}/*statd \ | 81 | FILES:${PN}-client = "${sbindir}/*statd \ |
82 | ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \ | 82 | ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \ |
83 | ${sbindir}/showmount ${sbindir}/nfsstat \ | 83 | ${sbindir}/showmount ${sbindir}/nfsstat \ |
84 | ${localstatedir}/lib/nfs \ | 84 | ${localstatedir}/lib/nfs \ |
@@ -86,32 +86,32 @@ FILES_${PN}-client = "${sbindir}/*statd \ | |||
86 | ${sysconfdir}/nfsmount.conf \ | 86 | ${sysconfdir}/nfsmount.conf \ |
87 | ${sysconfdir}/init.d/nfscommon \ | 87 | ${sysconfdir}/init.d/nfscommon \ |
88 | ${systemd_unitdir}/system/nfs-statd.service" | 88 | ${systemd_unitdir}/system/nfs-statd.service" |
89 | RDEPENDS_${PN}-client = "${PN}-mount rpcbind" | 89 | RDEPENDS:${PN}-client = "${PN}-mount rpcbind" |
90 | 90 | ||
91 | FILES_${PN}-mount = "${base_sbindir}/*mount.nfs*" | 91 | FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*" |
92 | 92 | ||
93 | FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat ${sbindir}/nfsdclnts" | 93 | FILES:${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat ${sbindir}/nfsdclnts" |
94 | RDEPENDS_${PN}-stats = "python3-core" | 94 | RDEPENDS:${PN}-stats = "python3-core" |
95 | 95 | ||
96 | FILES_${PN}-staticdev += "${libdir}/libnfsidmap/*.a" | 96 | FILES:${PN}-staticdev += "${libdir}/libnfsidmap/*.a" |
97 | 97 | ||
98 | FILES_${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/" | 98 | FILES:${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/" |
99 | 99 | ||
100 | do_configure_prepend() { | 100 | do_configure:prepend() { |
101 | sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ | 101 | sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ |
102 | ${S}/utils/mount/Makefile.am | 102 | ${S}/utils/mount/Makefile.am |
103 | } | 103 | } |
104 | 104 | ||
105 | # Make clean needed because the package comes with | 105 | # Make clean needed because the package comes with |
106 | # precompiled 64-bit objects that break the build | 106 | # precompiled 64-bit objects that break the build |
107 | do_compile_prepend() { | 107 | do_compile:prepend() { |
108 | make clean | 108 | make clean |
109 | } | 109 | } |
110 | 110 | ||
111 | # Works on systemd only | 111 | # Works on systemd only |
112 | HIGH_RLIMIT_NOFILE ??= "4096" | 112 | HIGH_RLIMIT_NOFILE ??= "4096" |
113 | 113 | ||
114 | do_install_append () { | 114 | do_install:append () { |
115 | install -d ${D}${sysconfdir}/init.d | 115 | install -d ${D}${sysconfdir}/init.d |
116 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver | 116 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver |
117 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon | 117 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon |