diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-07-31 23:31:13 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-07-31 23:49:54 -0400 |
commit | 0cffcd09a44b2a58452a5bb13714bfc47d6546bf (patch) | |
tree | b91584b573ce42431a35a9b8f064d8be57974e1e /recipes-extended | |
parent | e887a996155f8b9f22d6aca0e31b5fbccd82751e (diff) | |
download | meta-cloud-services-0cffcd09a44b2a58452a5bb13714bfc47d6546bf.tar.gz |
global: overrides conversion
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended')
-rw-r--r-- | recipes-extended/glusterfs/glusterfs.inc | 42 | ||||
-rw-r--r-- | recipes-extended/librdmacm/librdmacm_1.1.0.bb | 16 |
2 files changed, 29 insertions, 29 deletions
diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc index 81ea65e..646b521 100644 --- a/recipes-extended/glusterfs/glusterfs.inc +++ b/recipes-extended/glusterfs/glusterfs.inc | |||
@@ -52,8 +52,8 @@ EXTRA_OECONF = "ac_cv_file__etc_debian_version=no \ | |||
52 | " | 52 | " |
53 | 53 | ||
54 | PACKAGECONFIG ??= "georeplication libibverbs" | 54 | PACKAGECONFIG ??= "georeplication libibverbs" |
55 | PACKAGECONFIG_remove_mipsarch = "libibverbs" | 55 | PACKAGECONFIG:remove:mipsarch = "libibverbs" |
56 | PACKAGECONFIG_remove_arm = "libibverbs" | 56 | PACKAGECONFIG:remove:arm = "libibverbs" |
57 | 57 | ||
58 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," | 58 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," |
59 | PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync" | 59 | PACKAGECONFIG[georeplication] = "--enable-georeplication,--disable-georeplication,,rsync" |
@@ -61,7 +61,7 @@ PACKAGECONFIG[libibverbs] = "--enable-ibverbs,--disable-ibverbs,virtual/libibver | |||
61 | PACKAGECONFIG[ocf] = "--with-ocf,--without-ocf,," | 61 | PACKAGECONFIG[ocf] = "--with-ocf,--without-ocf,," |
62 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," | 62 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," |
63 | 63 | ||
64 | do_install_append() { | 64 | do_install:append() { |
65 | install -d ${D}${sysconfdir}/init.d | 65 | install -d ${D}${sysconfdir}/init.d |
66 | install -m 0755 ${WORKDIR}/glusterd.init \ | 66 | install -m 0755 ${WORKDIR}/glusterd.init \ |
67 | ${D}${sysconfdir}/init.d/glusterd | 67 | ${D}${sysconfdir}/init.d/glusterd |
@@ -108,29 +108,29 @@ INITSCRIPT_NAME = "glusterd" | |||
108 | INITSCRIPT_PARAMS = "start 20 5 3 2 . stop 80 0 1 6 ." | 108 | INITSCRIPT_PARAMS = "start 20 5 3 2 . stop 80 0 1 6 ." |
109 | 109 | ||
110 | SYSTEMD_PACKAGES = "glusterfs-server" | 110 | SYSTEMD_PACKAGES = "glusterfs-server" |
111 | SYSTEMD_SERVICE_${PN} = "glusterd.service" | 111 | SYSTEMD_SERVICE:${PN} = "glusterd.service" |
112 | SYSTEMD_AUTO_ENABLE = "disable" | 112 | SYSTEMD_AUTO_ENABLE = "disable" |
113 | 113 | ||
114 | # Allow plug-in symlinks. | 114 | # Allow plug-in symlinks. |
115 | INSANE_SKIP_${PN} += "dev-so" | 115 | INSANE_SKIP:${PN} += "dev-so" |
116 | INSANE_SKIP_${PN}-rdma += "dev-so" | 116 | INSANE_SKIP:${PN}-rdma += "dev-so" |
117 | INSANE_SKIP_${PN}-fuse += "dev-so" | 117 | INSANE_SKIP:${PN}-fuse += "dev-so" |
118 | INSANE_SKIP_${PN}-server += "dev-so" | 118 | INSANE_SKIP:${PN}-server += "dev-so" |
119 | 119 | ||
120 | PACKAGES += "${PN}-rdma ${PN}-geo-replication ${PN}-fuse ${PN}-server \ | 120 | PACKAGES += "${PN}-rdma ${PN}-geo-replication ${PN}-fuse ${PN}-server \ |
121 | ${PN}-api ${PN}-ocf" | 121 | ${PN}-api ${PN}-ocf" |
122 | 122 | ||
123 | RDEPENDS_${PN} += "python3-core python3-json python3-ctypes bash" | 123 | RDEPENDS:${PN} += "python3-core python3-json python3-ctypes bash" |
124 | RDEPENDS_${PN}-ocf += "bash" | 124 | RDEPENDS:${PN}-ocf += "bash" |
125 | RDEPENDS_${PN}-server += "bash" | 125 | RDEPENDS:${PN}-server += "bash" |
126 | RDEPENDS_${PN}-geo-replication += "python3-core bash" | 126 | RDEPENDS:${PN}-geo-replication += "python3-core bash" |
127 | 127 | ||
128 | FILES_${PN}-dbg += "${libdir}/glusterfs/${PV}/*/.debug \ | 128 | FILES:${PN}-dbg += "${libdir}/glusterfs/${PV}/*/.debug \ |
129 | ${libdir}/glusterfs/${PV}/*/*/.debug \ | 129 | ${libdir}/glusterfs/${PV}/*/*/.debug \ |
130 | ${libdir}/glusterfs/${PV}/*/*/*/.debug \ | 130 | ${libdir}/glusterfs/${PV}/*/*/*/.debug \ |
131 | ${libexecdir}/glusterfs/.debug" | 131 | ${libexecdir}/glusterfs/.debug" |
132 | 132 | ||
133 | FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \ | 133 | FILES:${PN} = "${libdir}/glusterfs/${PV}/auth \ |
134 | ${libdir}/glusterfs/${PV}/rpc-transport/socket* \ | 134 | ${libdir}/glusterfs/${PV}/rpc-transport/socket* \ |
135 | ${libdir}/glusterfs/${PV}/xlator/cluster \ | 135 | ${libdir}/glusterfs/${PV}/xlator/cluster \ |
136 | ${libdir}/glusterfs/${PV}/xlator/debug \ | 136 | ${libdir}/glusterfs/${PV}/xlator/debug \ |
@@ -182,20 +182,20 @@ FILES_${PN} = "${libdir}/glusterfs/${PV}/auth \ | |||
182 | ${datadir}/glusterfs/* \ | 182 | ${datadir}/glusterfs/* \ |
183 | " | 183 | " |
184 | 184 | ||
185 | FILES_${PN}-rdma = "${libdir}/glusterfs/${PV}/rpc-transport/rdma*" | 185 | FILES:${PN}-rdma = "${libdir}/glusterfs/${PV}/rpc-transport/rdma*" |
186 | 186 | ||
187 | FILES_${PN}-geo-replication = "${libexecdir}/glusterfs/gsyncd \ | 187 | FILES:${PN}-geo-replication = "${libexecdir}/glusterfs/gsyncd \ |
188 | ${libexecdir}/glusterfs/python/syncdaemon \ | 188 | ${libexecdir}/glusterfs/python/syncdaemon \ |
189 | ${libexecdir}/glusterfs/peer_georep-sshkey.py \ | 189 | ${libexecdir}/glusterfs/peer_georep-sshkey.py \ |
190 | ${libexecdir}/glusterfs/set_geo_rep_pem_keys.sh \ | 190 | ${libexecdir}/glusterfs/set_geo_rep_pem_keys.sh \ |
191 | ${sbindir}/gluster-georep-sshkey" | 191 | ${sbindir}/gluster-georep-sshkey" |
192 | 192 | ||
193 | FILES_${PN}-fuse = "${bindir}/fusermount-glusterfs \ | 193 | FILES:${PN}-fuse = "${bindir}/fusermount-glusterfs \ |
194 | ${libdir}/glusterfs/${PV}/xlator/mount \ | 194 | ${libdir}/glusterfs/${PV}/xlator/mount \ |
195 | ${sbindir}/mount.glusterfs \ | 195 | ${sbindir}/mount.glusterfs \ |
196 | ${base_sbindir}/mount.glusterfs" | 196 | ${base_sbindir}/mount.glusterfs" |
197 | 197 | ||
198 | FILES_${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \ | 198 | FILES:${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \ |
199 | ${libdir}/glusterfs/${PV}/xlator/nfs \ | 199 | ${libdir}/glusterfs/${PV}/xlator/nfs \ |
200 | ${libdir}/glusterfs/${PV}/xlator/protocol/server* \ | 200 | ${libdir}/glusterfs/${PV}/xlator/protocol/server* \ |
201 | ${libdir}/glusterfs/${PV}/xlator/storage \ | 201 | ${libdir}/glusterfs/${PV}/xlator/storage \ |
@@ -208,11 +208,11 @@ FILES_${PN}-server = "${libdir}/glusterfs/${PV}/xlator/mgmt \ | |||
208 | ${systemd_system_unitdir}" | 208 | ${systemd_system_unitdir}" |
209 | 209 | ||
210 | # Note: Debian package renaming produces libgfapi[0-9]+-*.*.rpm. | 210 | # Note: Debian package renaming produces libgfapi[0-9]+-*.*.rpm. |
211 | FILES_${PN}-api = "${libdir}/libgfapi.so.*" | 211 | FILES:${PN}-api = "${libdir}/libgfapi.so.*" |
212 | 212 | ||
213 | FILES_${PN}-ocf = "${prefix}/lib/ocf" | 213 | FILES:${PN}-ocf = "${prefix}/lib/ocf" |
214 | 214 | ||
215 | pkg_postinst_${PN}() { | 215 | pkg_postinst:${PN}() { |
216 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ]; then | 216 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ]; then |
217 | /etc/init.d/populate-volatile.sh update | 217 | /etc/init.d/populate-volatile.sh update |
218 | fi | 218 | fi |
diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb index edf92f0..2e18b0a 100644 --- a/recipes-extended/librdmacm/librdmacm_1.1.0.bb +++ b/recipes-extended/librdmacm/librdmacm_1.1.0.bb | |||
@@ -24,21 +24,21 @@ SRC_URI[sha256sum] = "8f10848d4810585d6d70b443abc876c1db8df5e9b8b07e095c7e6eaf4a | |||
24 | inherit autotools | 24 | inherit autotools |
25 | 25 | ||
26 | # Allow plug-in symlinks. | 26 | # Allow plug-in symlinks. |
27 | INSANE_SKIP_${PN} += "dev-so" | 27 | INSANE_SKIP:${PN} += "dev-so" |
28 | 28 | ||
29 | PACKAGES += "${PN}-utils" | 29 | PACKAGES += "${PN}-utils" |
30 | FILES_${PN} = "${libdir}/*.so.* ${libdir}/rsocket/*.so*" | 30 | FILES:${PN} = "${libdir}/*.so.* ${libdir}/rsocket/*.so*" |
31 | FILES_${PN}-utils = "${bindir}" | 31 | FILES:${PN}-utils = "${bindir}" |
32 | FILES_${PN}-staticdev += "${libdir}/rsocket/librspreload.a" | 32 | FILES:${PN}-staticdev += "${libdir}/rsocket/librspreload.a" |
33 | FILES_${PN}-dbg += "${libdir}/rsocket/.debug" | 33 | FILES:${PN}-dbg += "${libdir}/rsocket/.debug" |
34 | 34 | ||
35 | PACKAGECONFIG ??= "" | 35 | PACKAGECONFIG ??= "" |
36 | PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind," | 36 | PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind," |
37 | 37 | ||
38 | do_install_append() { | 38 | do_install:append() { |
39 | rm -f ${D}${libdir}/librdmacm.la | 39 | rm -f ${D}${libdir}/librdmacm.la |
40 | rm -f ${D}${libdir}/rsocket/librspreload.la | 40 | rm -f ${D}${libdir}/rsocket/librspreload.la |
41 | } | 41 | } |
42 | 42 | ||
43 | COMPATIBLE_HOST_mipsarch = "none" | 43 | COMPATIBLE_HOST:mipsarch = "none" |
44 | COMPATIBLE_HOST_arm = "none" | 44 | COMPATIBLE_HOST:arm = "none" |