diff options
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 DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" -RDEPENDS_${PN} += "glib-networking" +RDEPENDS:${PN} += "glib-networking" REQUIRED_DISTRO_FEATURES = "systemd pam" @@ -67,59 +67,59 @@ PACKAGES =+ " \ " SYSTEMD_PACKAGES = "${PN}-ws" -FILES_${PN}-pcp = " \ +FILES:${PN}-pcp = " \ ${libexecdir}/cockpit-pcp \ ${datadir}/cockpit/pcp \ ${localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit \ " -FILES_${PN}-realmd = "${datadir}/cockpit/realmd" -FILES_${PN}-tuned = "${datadir}/cockpit/tuned" -FILES_${PN}-shell = "${datadir}/cockpit/shell" -FILES_${PN}-systemd = "${datadir}/cockpit/systemd" -FILES_${PN}-users = "${datadir}/cockpit/users" -FILES_${PN}-kdump = " \ +FILES:${PN}-realmd = "${datadir}/cockpit/realmd" +FILES:${PN}-tuned = "${datadir}/cockpit/tuned" +FILES:${PN}-shell = "${datadir}/cockpit/shell" +FILES:${PN}-systemd = "${datadir}/cockpit/systemd" +FILES:${PN}-users = "${datadir}/cockpit/users" +FILES:${PN}-kdump = " \ ${datadir}/cockpit/kdump \ ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \ " -FILES_${PN}-sosreport = " \ +FILES:${PN}-sosreport = " \ ${datadir}/cockpit/sosreport \ ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \ ${datadir}/pixmaps/cockpit-sosreport.png \ " -FILES_${PN}-storaged = " \ +FILES:${PN}-storaged = " \ ${datadir}/cockpit/storaged \ ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ " -FILES_${PN}-networkmanager = "${datadir}/cockpit/networkmanager" -RDEPENDS_${PN}-networkmanager = "networkmanager" +FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" +RDEPENDS:${PN}-networkmanager = "networkmanager" -FILES_${PN}-machines = " \ +FILES:${PN}-machines = " \ ${datadir}/cockpit/machines \ ${datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml \ " -FILES_${PN}-selinux = " \ +FILES:${PN}-selinux = " \ ${datadir}/cockpit/selinux \ ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \ " -FILES_${PN}-playground = "${datadir}/cockpit/playground" -FILES_${PN}-docker = " \ +FILES:${PN}-playground = "${datadir}/cockpit/playground" +FILES:${PN}-docker = " \ ${datadir}/cockpit/docker \ ${datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml \ " -FILES_${PN}-dashboard = "${datadir}/cockpit/dashboard" -ALLOW_EMPTY_${PN}-dashboard = "1" +FILES:${PN}-dashboard = "${datadir}/cockpit/dashboard" +ALLOW_EMPTY:${PN}-dashboard = "1" -FILES_${PN}-bridge = " \ +FILES:${PN}-bridge = " \ ${bindir}/cockpit-bridge \ ${libexec}/cockpit-askpass \ " -RDEPENDS_${PN}-bridge = "" +RDEPENDS:${PN}-bridge = "" -FILES_${PN}-desktop = "${libexecdir}/cockpit-desktop" -RDEPENDS_${PN}-desktop += "bash" +FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" +RDEPENDS:${PN}-desktop += "bash" -FILES_${PN}-ws = " \ +FILES:${PN}-ws = " \ ${sysconfdir}/cockpit/ws-certs.d \ ${sysconfdir}/pam.d/cockpit \ ${sysconfdir}/issue.d/cockpit.issue \ @@ -150,14 +150,14 @@ FILES_${PN}-ws = " \ ${datadir}/cockpit/static \ ${datadir}/cockpit/branding \ " -CONFFILES_${PN}-ws += " \ +CONFFILES:${PN}-ws += " \ ${sysconfdir}/issue.d/cockpit.issue \ ${sysconfdir}/motd.d/cockpit \ " -RDEPENDS_${PN}-ws += "openssl-bin" -SYSTEMD_SERVICE_${PN}-ws = "cockpit.socket" +RDEPENDS:${PN}-ws += "openssl-bin" +SYSTEMD_SERVICE:${PN}-ws = "cockpit.socket" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/cockpit/base1 \ ${sysconfdir}/cockpit/machines.d \ ${datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ @@ -167,9 +167,9 @@ FILES_${PN} += " \ ${datadir}/metainfo/cockpit.appdata.xml \ ${datadir}/pixmaps/cockpit.png \ " -RDEPENDS_${PN} += "${PN}-bridge" +RDEPENDS:${PN} += "${PN}-bridge" -do_install_append() { +do_install:append() { pkgdatadir=${datadir}/cockpit 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" inherit pkgconfig autotools-brokensep useradd systemd -LIBS_toolchain-clang_x86 = "-latomic" -LIBS_riscv64 = "-latomic" -LIBS_riscv32 = "-latomic" +LIBS:toolchain-clang:x86 = "-latomic" +LIBS:riscv64 = "-latomic" +LIBS:riscv32 = "-latomic" export LIBS #systemd SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "netdata.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "netdata.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" #User specific USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system netdata" +GROUPADD_PARAM:${PN} = "--system netdata" -do_install_append() { +do_install:append() { #set S UID for plugins chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin @@ -52,4 +52,4 @@ do_install_append() { sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf } -RDEPENDS_${PN} = "bash zlib" +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() { INITSCRIPT_NAME = "webmin" INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ." -SYSTEMD_SERVICE_${PN} = "webmin.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "webmin.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" # FIXME: some of this should be figured out automatically -RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict" -RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader" -RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant" -RDEPENDS_${PN} += "perl-module-file-glob perl-module-file-copy perl-module-sdbm-file perl-module-feature" +RDEPENDS:${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict" +RDEPENDS:${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader" +RDEPENDS:${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant" +RDEPENDS:${PN} += "perl-module-file-glob perl-module-file-copy perl-module-sdbm-file perl-module-feature" PACKAGES_DYNAMIC += "webmin-module-* webmin-theme-*" -RRECOMMENDS_${PN} += "webmin-module-system-status" +RRECOMMENDS:${PN} += "webmin-module-system-status" PACKAGES += "${PN}-module-proc ${PN}-module-raid ${PN}-module-exports ${PN}-module-fdisk ${PN}-module-lvm" -RDEPENDS_${PN}-module-proc = "procps" -RDEPENDS_${PN}-module-raid = "mdadm" -RDEPENDS_${PN}-module-exports = "perl-module-file-basename perl-module-file-path perl-module-cwd perl-module-file-spec perl-module-file-spec-unix" -RRECOMMENDS_${PN}-module-fdisk = "parted" -RRECOMMENDS_${PN}-module-lvm = "lvm2" +RDEPENDS:${PN}-module-proc = "procps" +RDEPENDS:${PN}-module-raid = "mdadm" +RDEPENDS:${PN}-module-exports = "perl-module-file-basename perl-module-file-path perl-module-cwd perl-module-file-spec perl-module-file-spec-unix" +RRECOMMENDS:${PN}-module-fdisk = "parted" +RRECOMMENDS:${PN}-module-lvm = "lvm2" -python populate_packages_prepend() { +python populate_packages:prepend() { import os, os.path wadir = bb.data.expand('${libexecdir}/webmin', d) |