diff options
Diffstat (limited to 'meta-openembedded/meta-webserver')
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb (renamed from meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.51.bb) | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb | 19 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | 19 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb (renamed from meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb) | 21 |
9 files changed, 55 insertions, 20 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index 884d467eec..040788609e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -11,7 +11,7 @@ RDEPENDS:${PN} += "apache2" # Original (github.com/disconnect/apache-websocket) is dead since 2012, the # fork contains patches from the modules ML and fixes CVE compliance issues -SRC_URI = "git://github.com/jchampio/apache-websocket.git" +SRC_URI = "git://github.com/jchampio/apache-websocket.git;branch=master;protocol=https" SRCREV = "0ee34c77fc78ff08fd548706300b80a7bc7874e4" @@ -21,8 +21,7 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl \ - LIBTOOL=${STAGING_DIR_TARGET}${bindir_crossscripts}/${HOST_SYS}-libtool" +EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl" do_install() { install -d ${D}${libexecdir}/apache2/modules diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.51.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb index 4b36c50d55..39407b8a1d 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.51.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb @@ -26,7 +26,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4" +SRC_URI[sha256sum] = "0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9" S = "${WORKDIR}/httpd-${PV}" @@ -156,7 +156,6 @@ apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${sbindir} install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk diff --git a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 7077d76d7a..16733c6621 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -9,7 +9,7 @@ DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEAT SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59" PV = "1.2.104+git${SRCPV}" -SRC_URI = "git://github.com/cherokee/webserver \ +SRC_URI = "git://github.com/cherokee/webserver;branch=master;protocol=https \ file://cherokee.init \ file://cherokee.service \ file://cherokee-install-configured.py-once.patch \ diff --git a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb index f66ec7d736..f13f144fcc 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb @@ -50,7 +50,23 @@ do_install:append() { install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system fi - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" "${D}${localstatedir}/run" + # /var/log/hiawatha and /var/lib/hiawatha needs to be created in runtime. + # Use rmdir to catch if upstream stops creating these dirs, or adds + # something else in /var/log. + rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log + rmdir ${D}${localstatedir}/run + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + + # Create /var/log/hiawatha at runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN} - - - -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi + } CONFFILES:${PN} = " \ @@ -61,4 +77,5 @@ CONFFILES:${PN} = " \ ${sysconfdir}/hiawatha/php-fcgi.conf \ " +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" FILES:${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 1386770c8a..fff406a3f2 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ - -DPID_FILE=${localstatedir}/run/monkey.pid \ + -DPID_FILE=/run/monkey.pid \ -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ -DWITH_PLUGINS=* \ -DWITHOUT_PLUGINS=mbedtls \ @@ -38,10 +38,18 @@ inherit cmake pkgconfig update-rc.d systemd OECMAKE_GENERATOR = "Unix Makefiles" do_install:append() { - rm -rf ${D}/run - rm -rf ${D}${localstatedir}/run + rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey - + # Create /var/log/monkey in runtime. + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then + install -d ${D}${nonarch_libdir}/tmpfiles.d + echo "d ${localstatedir}/log/${BPN} 0755 ${BPN} ${BPN} -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf + fi + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d ${BPN} ${BPN} 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} + fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service fi @@ -56,8 +64,7 @@ PACKAGES += "${PN}-plugins" FILES:${PN}-plugins = "${libdir}/monkey-*.so" -FILES:${PN} += "${localstatedir}/www/monkey/ /run" - +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \ ${sysconfdir}/monkey/sites/default \ diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 7637002f23..b99e29ef99 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -94,7 +94,7 @@ do_install () { >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi install -d ${D}${sysconfdir}/${BPN} - lnr ${D}${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run + ln -rs ${D}${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run install -d ${D}${NGINX_WWWDIR} mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/ chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} diff --git a/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index 8a30b74c81..4134a0e524 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/thttpd.c;beginline=1;endline=26;md5=0c5762c2c34dc DEPENDS += "base-passwd virtual/crypt" SRCREV = "2845bf5bff2b820d2336c8c8061cbfc5f271e720" -SRC_URI = "git://github.com/blueness/${BPN} \ +SRC_URI = "git://github.com/blueness/${BPN};branch=master;protocol=https \ file://thttpd.service \ file://thttpd.conf \ file://init" diff --git a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb index 6df58ad3c4..61ef6073e0 100644 --- a/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb +++ b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" SRCREV = "382aa2b0d53a87c27f2f647dfaf670375ba0b85f" PV = "2.4.2" -SRC_URI = "git://github.com/FastCGI-Archives/fcgi2.git;protocol=https \ +SRC_URI = "git://github.com/FastCGI-Archives/fcgi2.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb index fb4d272947..dbce1c432f 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb @@ -5,8 +5,10 @@ DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troublesho LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -SRC_URI = "git://github.com/netdata/netdata.git;protocol=https" -SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766" +DEPENDS += "libuv openssl util-linux zlib " + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-v${PV}.tar.gz" +SRC_URI[sha256sum] = "ac406513e86ad24976a66146702aeac960e43908abc51d70e4a073905275d13e" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" @@ -14,15 +16,19 @@ SRC_URI += "file://netdata.conf" # file for providing systemd service support SRC_URI += "file://netdata.service" -S = "${WORKDIR}/git" +UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" + +S = "${WORKDIR}/${BPN}-v${PV}" -DEPENDS += "zlib util-linux libuv" +# Stop sending anonymous statistics to Google Analytics +NETDATA_ANONYMOUS ??= "enabled" inherit pkgconfig autotools-brokensep useradd systemd LIBS:toolchain-clang:x86 = "-latomic" LIBS:riscv64 = "-latomic" LIBS:riscv32 = "-latomic" +LIBS:mips = "-latomic" export LIBS #systemd @@ -34,6 +40,9 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" +# ebpf doesn't compile (or detect) the cross compilation well +EXTRA_OECONF += "--disable-ebpf" + do_install:append() { #set S UID for plugins chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin @@ -52,6 +61,10 @@ do_install:append() { sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then + touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics + fi + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata |