diff options
author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /meta-openembedded/meta-webserver | |
parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-openembedded/meta-webserver')
-rw-r--r-- | meta-openembedded/meta-webserver/README | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb (renamed from meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb) | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb (renamed from meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service | 12 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb (renamed from meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb) | 16 |
5 files changed, 24 insertions, 17 deletions
diff --git a/meta-openembedded/meta-webserver/README b/meta-openembedded/meta-webserver/README index 7b6063070..d23f6cc65 100644 --- a/meta-openembedded/meta-webserver/README +++ b/meta-openembedded/meta-webserver/README @@ -11,17 +11,15 @@ Dependencies This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/openembedded-core subdirectory: meta branch: master -revision: HEAD For some recipes, the meta-oe layer is required: -URI: git://github.com/openembedded/meta-oe.git +URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe branch: master -revision: HEAD diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb index 1ac4fcbf2..e5d187957 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.48.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.49.bb @@ -26,8 +26,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[md5sum] = "a7088cec171b0d00bf43394ce64d3909" -SRC_URI[sha256sum] = "1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c" +SRC_URI[sha256sum] = "65b965d6890ea90d9706595e4b7b9365b5060bec8ea723449480b4769974133b" S = "${WORKDIR}/httpd-${PV}" diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb index 84e1da620..b64824c47 100644 --- a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb +++ b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb @@ -11,8 +11,8 @@ SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-la file://apache.conf \ " -SRC_URI[md5sum] = "4587343e706c5434adf91c396b418731" -SRC_URI[sha256sum] = "aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68" +SRC_URI[md5sum] = "e73377b11b7d38fa3f3014f2799c5252" +SRC_URI[sha256sum] = "1964d7190223c11e89fa1b7970c618e3a3bae2e859f5f60383f64c3848ef6921" UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service index b244d1866..ca13f7287 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service @@ -1,13 +1,15 @@ +# SPDX-License-Identifier: GPL-3.0-or-later [Unit] -Description=Netdata, Real-time performance monitoring +Description=Real time performance monitoring RequiresMountsFor=/var +After=network.target [Service] -User=root +Type=simple ExecStartPre=/bin/mkdir -p /var/log/netdata -ExecStartPre=/bin/chown -R nobody.netdata @@datadir/netdata/web -ExecStartPre=/bin/chown -R nobody.netdata /var/cache/netdata -ExecStart=/usr/sbin/netdata -nd +ExecStartPre=/bin/chown -R netdata.netdata /var/log/netdata +ExecStart=/usr/sbin/netdata -D -u netdata + [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb index 7c48b8a37..fb4d27294 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb @@ -1,11 +1,12 @@ -HOMEPAGE = "https://github.com/firehol/netdata/" +HOMEPAGE = "https://github.com/netdata/netdata/" SUMMARY = "Real-time performance monitoring" +DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ + Open-source, free, preconfigured, opinionated, and always real-time." LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" +SRC_URI = "git://github.com/netdata/netdata.git;protocol=https" SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766" -PV = "1.22.1" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" @@ -31,7 +32,7 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" #User specific USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system netdata" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" do_install:append() { #set S UID for plugins @@ -50,6 +51,13 @@ do_install:append() { sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata + install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata + + chown -R netdata:netdata ${D}${datadir}/netdata/web } +FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" + RDEPENDS:${PN} = "bash zlib" |