diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
| commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
| tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-webserver/recipes-webadmin | |
| parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
| download | meta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz | |
Convert to new override syntax
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-webadmin')
3 files changed, 51 insertions, 51 deletions
diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb index f06588a75a..c49ba04564 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb | |||
| @@ -17,9 +17,9 @@ inherit gettext pkgconfig autotools systemd features_check | |||
| 17 | 17 | ||
| 18 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" | 18 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" |
| 19 | 19 | ||
| 20 | COMPATIBLE_HOST_libc-musl = "null" | 20 | COMPATIBLE_HOST:libc-musl = "null" |
| 21 | 21 | ||
| 22 | RDEPENDS_${PN} += "glib-networking" | 22 | RDEPENDS:${PN} += "glib-networking" |
| 23 | 23 | ||
| 24 | REQUIRED_DISTRO_FEATURES = "systemd pam" | 24 | REQUIRED_DISTRO_FEATURES = "systemd pam" |
| 25 | 25 | ||
| @@ -67,59 +67,59 @@ PACKAGES =+ " \ | |||
| 67 | " | 67 | " |
| 68 | SYSTEMD_PACKAGES = "${PN}-ws" | 68 | SYSTEMD_PACKAGES = "${PN}-ws" |
| 69 | 69 | ||
| 70 | FILES_${PN}-pcp = " \ | 70 | FILES:${PN}-pcp = " \ |
| 71 | ${libexecdir}/cockpit-pcp \ | 71 | ${libexecdir}/cockpit-pcp \ |
| 72 | ${datadir}/cockpit/pcp \ | 72 | ${datadir}/cockpit/pcp \ |
| 73 | ${localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit \ | 73 | ${localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit \ |
| 74 | " | 74 | " |
| 75 | FILES_${PN}-realmd = "${datadir}/cockpit/realmd" | 75 | FILES:${PN}-realmd = "${datadir}/cockpit/realmd" |
| 76 | FILES_${PN}-tuned = "${datadir}/cockpit/tuned" | 76 | FILES:${PN}-tuned = "${datadir}/cockpit/tuned" |
| 77 | FILES_${PN}-shell = "${datadir}/cockpit/shell" | 77 | FILES:${PN}-shell = "${datadir}/cockpit/shell" |
| 78 | FILES_${PN}-systemd = "${datadir}/cockpit/systemd" | 78 | FILES:${PN}-systemd = "${datadir}/cockpit/systemd" |
| 79 | FILES_${PN}-users = "${datadir}/cockpit/users" | 79 | FILES:${PN}-users = "${datadir}/cockpit/users" |
| 80 | FILES_${PN}-kdump = " \ | 80 | FILES:${PN}-kdump = " \ |
| 81 | ${datadir}/cockpit/kdump \ | 81 | ${datadir}/cockpit/kdump \ |
| 82 | ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \ | 82 | ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \ |
| 83 | " | 83 | " |
| 84 | FILES_${PN}-sosreport = " \ | 84 | FILES:${PN}-sosreport = " \ |
| 85 | ${datadir}/cockpit/sosreport \ | 85 | ${datadir}/cockpit/sosreport \ |
| 86 | ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \ | 86 | ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \ |
| 87 | ${datadir}/pixmaps/cockpit-sosreport.png \ | 87 | ${datadir}/pixmaps/cockpit-sosreport.png \ |
| 88 | " | 88 | " |
| 89 | FILES_${PN}-storaged = " \ | 89 | FILES:${PN}-storaged = " \ |
| 90 | ${datadir}/cockpit/storaged \ | 90 | ${datadir}/cockpit/storaged \ |
| 91 | ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ | 91 | ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ |
| 92 | " | 92 | " |
| 93 | 93 | ||
| 94 | FILES_${PN}-networkmanager = "${datadir}/cockpit/networkmanager" | 94 | FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" |
| 95 | RDEPENDS_${PN}-networkmanager = "networkmanager" | 95 | RDEPENDS:${PN}-networkmanager = "networkmanager" |
| 96 | 96 | ||
| 97 | FILES_${PN}-machines = " \ | 97 | FILES:${PN}-machines = " \ |
| 98 | ${datadir}/cockpit/machines \ | 98 | ${datadir}/cockpit/machines \ |
| 99 | ${datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml \ | 99 | ${datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml \ |
| 100 | " | 100 | " |
| 101 | FILES_${PN}-selinux = " \ | 101 | FILES:${PN}-selinux = " \ |
| 102 | ${datadir}/cockpit/selinux \ | 102 | ${datadir}/cockpit/selinux \ |
| 103 | ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \ | 103 | ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \ |
| 104 | " | 104 | " |
| 105 | FILES_${PN}-playground = "${datadir}/cockpit/playground" | 105 | FILES:${PN}-playground = "${datadir}/cockpit/playground" |
| 106 | FILES_${PN}-docker = " \ | 106 | FILES:${PN}-docker = " \ |
| 107 | ${datadir}/cockpit/docker \ | 107 | ${datadir}/cockpit/docker \ |
| 108 | ${datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml \ | 108 | ${datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml \ |
| 109 | " | 109 | " |
| 110 | FILES_${PN}-dashboard = "${datadir}/cockpit/dashboard" | 110 | FILES:${PN}-dashboard = "${datadir}/cockpit/dashboard" |
| 111 | ALLOW_EMPTY_${PN}-dashboard = "1" | 111 | ALLOW_EMPTY:${PN}-dashboard = "1" |
| 112 | 112 | ||
| 113 | FILES_${PN}-bridge = " \ | 113 | FILES:${PN}-bridge = " \ |
| 114 | ${bindir}/cockpit-bridge \ | 114 | ${bindir}/cockpit-bridge \ |
| 115 | ${libexec}/cockpit-askpass \ | 115 | ${libexec}/cockpit-askpass \ |
| 116 | " | 116 | " |
| 117 | RDEPENDS_${PN}-bridge = "" | 117 | RDEPENDS:${PN}-bridge = "" |
| 118 | 118 | ||
| 119 | FILES_${PN}-desktop = "${libexecdir}/cockpit-desktop" | 119 | FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" |
| 120 | RDEPENDS_${PN}-desktop += "bash" | 120 | RDEPENDS:${PN}-desktop += "bash" |
| 121 | 121 | ||
| 122 | FILES_${PN}-ws = " \ | 122 | FILES:${PN}-ws = " \ |
| 123 | ${sysconfdir}/cockpit/ws-certs.d \ | 123 | ${sysconfdir}/cockpit/ws-certs.d \ |
| 124 | ${sysconfdir}/pam.d/cockpit \ | 124 | ${sysconfdir}/pam.d/cockpit \ |
| 125 | ${sysconfdir}/issue.d/cockpit.issue \ | 125 | ${sysconfdir}/issue.d/cockpit.issue \ |
| @@ -150,14 +150,14 @@ FILES_${PN}-ws = " \ | |||
| 150 | ${datadir}/cockpit/static \ | 150 | ${datadir}/cockpit/static \ |
| 151 | ${datadir}/cockpit/branding \ | 151 | ${datadir}/cockpit/branding \ |
| 152 | " | 152 | " |
| 153 | CONFFILES_${PN}-ws += " \ | 153 | CONFFILES:${PN}-ws += " \ |
| 154 | ${sysconfdir}/issue.d/cockpit.issue \ | 154 | ${sysconfdir}/issue.d/cockpit.issue \ |
| 155 | ${sysconfdir}/motd.d/cockpit \ | 155 | ${sysconfdir}/motd.d/cockpit \ |
| 156 | " | 156 | " |
| 157 | RDEPENDS_${PN}-ws += "openssl-bin" | 157 | RDEPENDS:${PN}-ws += "openssl-bin" |
| 158 | SYSTEMD_SERVICE_${PN}-ws = "cockpit.socket" | 158 | SYSTEMD_SERVICE:${PN}-ws = "cockpit.socket" |
| 159 | 159 | ||
| 160 | FILES_${PN} += " \ | 160 | FILES:${PN} += " \ |
| 161 | ${datadir}/cockpit/base1 \ | 161 | ${datadir}/cockpit/base1 \ |
| 162 | ${sysconfdir}/cockpit/machines.d \ | 162 | ${sysconfdir}/cockpit/machines.d \ |
| 163 | ${datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ | 163 | ${datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ |
| @@ -167,9 +167,9 @@ FILES_${PN} += " \ | |||
| 167 | ${datadir}/metainfo/cockpit.appdata.xml \ | 167 | ${datadir}/metainfo/cockpit.appdata.xml \ |
| 168 | ${datadir}/pixmaps/cockpit.png \ | 168 | ${datadir}/pixmaps/cockpit.png \ |
| 169 | " | 169 | " |
| 170 | RDEPENDS_${PN} += "${PN}-bridge" | 170 | RDEPENDS:${PN} += "${PN}-bridge" |
| 171 | 171 | ||
| 172 | do_install_append() { | 172 | do_install:append() { |
| 173 | pkgdatadir=${datadir}/cockpit | 173 | pkgdatadir=${datadir}/cockpit |
| 174 | 174 | ||
| 175 | chmod 4750 ${D}${libexecdir}/cockpit-session | 175 | chmod 4750 ${D}${libexecdir}/cockpit-session |
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index ee4a7c1e3d..7c48b8a37d 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_git.bb | |||
| @@ -19,21 +19,21 @@ DEPENDS += "zlib util-linux libuv" | |||
| 19 | 19 | ||
| 20 | inherit pkgconfig autotools-brokensep useradd systemd | 20 | inherit pkgconfig autotools-brokensep useradd systemd |
| 21 | 21 | ||
| 22 | LIBS_toolchain-clang_x86 = "-latomic" | 22 | LIBS:toolchain-clang:x86 = "-latomic" |
| 23 | LIBS_riscv64 = "-latomic" | 23 | LIBS:riscv64 = "-latomic" |
| 24 | LIBS_riscv32 = "-latomic" | 24 | LIBS:riscv32 = "-latomic" |
| 25 | export LIBS | 25 | export LIBS |
| 26 | 26 | ||
| 27 | #systemd | 27 | #systemd |
| 28 | SYSTEMD_PACKAGES = "${PN}" | 28 | SYSTEMD_PACKAGES = "${PN}" |
| 29 | SYSTEMD_SERVICE_${PN} = "netdata.service" | 29 | SYSTEMD_SERVICE:${PN} = "netdata.service" |
| 30 | SYSTEMD_AUTO_ENABLE_${PN} = "enable" | 30 | SYSTEMD_AUTO_ENABLE:${PN} = "enable" |
| 31 | 31 | ||
| 32 | #User specific | 32 | #User specific |
| 33 | USERADD_PACKAGES = "${PN}" | 33 | USERADD_PACKAGES = "${PN}" |
| 34 | GROUPADD_PARAM_${PN} = "--system netdata" | 34 | GROUPADD_PARAM:${PN} = "--system netdata" |
| 35 | 35 | ||
| 36 | do_install_append() { | 36 | do_install:append() { |
| 37 | #set S UID for plugins | 37 | #set S UID for plugins |
| 38 | chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin | 38 | chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin |
| 39 | 39 | ||
| @@ -52,4 +52,4 @@ do_install_append() { | |||
| 52 | sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf | 52 | sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | RDEPENDS_${PN} = "bash zlib" | 55 | RDEPENDS:${PN} = "bash zlib" |
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb index 112365d4be..35ec09daea 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb | |||
| @@ -126,26 +126,26 @@ do_install() { | |||
| 126 | INITSCRIPT_NAME = "webmin" | 126 | INITSCRIPT_NAME = "webmin" |
| 127 | INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ." | 127 | INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ." |
| 128 | 128 | ||
| 129 | SYSTEMD_SERVICE_${PN} = "webmin.service" | 129 | SYSTEMD_SERVICE:${PN} = "webmin.service" |
| 130 | SYSTEMD_AUTO_ENABLE_${PN} = "disable" | 130 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" |
| 131 | 131 | ||
| 132 | # FIXME: some of this should be figured out automatically | 132 | # FIXME: some of this should be figured out automatically |
| 133 | RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict" | 133 | RDEPENDS:${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict" |
| 134 | RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader" | 134 | RDEPENDS:${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader" |
| 135 | RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant" | 135 | RDEPENDS:${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant" |
| 136 | RDEPENDS_${PN} += "perl-module-file-glob perl-module-file-copy perl-module-sdbm-file perl-module-feature" | 136 | RDEPENDS:${PN} += "perl-module-file-glob perl-module-file-copy perl-module-sdbm-file perl-module-feature" |
| 137 | 137 | ||
| 138 | PACKAGES_DYNAMIC += "webmin-module-* webmin-theme-*" | 138 | PACKAGES_DYNAMIC += "webmin-module-* webmin-theme-*" |
| 139 | RRECOMMENDS_${PN} += "webmin-module-system-status" | 139 | RRECOMMENDS:${PN} += "webmin-module-system-status" |
| 140 | 140 | ||
| 141 | PACKAGES += "${PN}-module-proc ${PN}-module-raid ${PN}-module-exports ${PN}-module-fdisk ${PN}-module-lvm" | 141 | PACKAGES += "${PN}-module-proc ${PN}-module-raid ${PN}-module-exports ${PN}-module-fdisk ${PN}-module-lvm" |
| 142 | RDEPENDS_${PN}-module-proc = "procps" | 142 | RDEPENDS:${PN}-module-proc = "procps" |
| 143 | RDEPENDS_${PN}-module-raid = "mdadm" | 143 | RDEPENDS:${PN}-module-raid = "mdadm" |
| 144 | RDEPENDS_${PN}-module-exports = "perl-module-file-basename perl-module-file-path perl-module-cwd perl-module-file-spec perl-module-file-spec-unix" | 144 | RDEPENDS:${PN}-module-exports = "perl-module-file-basename perl-module-file-path perl-module-cwd perl-module-file-spec perl-module-file-spec-unix" |
| 145 | RRECOMMENDS_${PN}-module-fdisk = "parted" | 145 | RRECOMMENDS:${PN}-module-fdisk = "parted" |
| 146 | RRECOMMENDS_${PN}-module-lvm = "lvm2" | 146 | RRECOMMENDS:${PN}-module-lvm = "lvm2" |
| 147 | 147 | ||
| 148 | python populate_packages_prepend() { | 148 | python populate_packages:prepend() { |
| 149 | import os, os.path | 149 | import os, os.path |
| 150 | 150 | ||
| 151 | wadir = bb.data.expand('${libexecdir}/webmin', d) | 151 | wadir = bb.data.expand('${libexecdir}/webmin', d) |
