From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- meta-openembedded/meta-webserver/README | 8 +- meta-openembedded/meta-webserver/conf/layer.conf | 2 +- .../images/meta-webserver-image-base.bb | 7 ++ .../recipes-core/images/meta-webserver-image.bb | 3 + .../packagesgroups/packagegroup-meta-webserver.bb | 37 ++++++ .../recipes-httpd/apache2/apache2_2.4.34.bb | 2 + .../recipes-httpd/nginx/files/default_server.site | 14 +++ .../recipes-httpd/nginx/files/nginx.conf | 139 +++++---------------- .../recipes-httpd/nginx/files/nginx.service | 10 +- .../recipes-httpd/nginx/files/proxy_params | 4 + .../meta-webserver/recipes-httpd/nginx/nginx.inc | 18 +++ .../recipes-httpd/nginx/nginx_1.14.2.bb | 10 ++ .../recipes-httpd/nginx/nginx_1.15.1.bb | 10 -- .../recipes-httpd/nginx/nginx_1.15.2.bb | 6 - .../recipes-httpd/nginx/nginx_1.15.7.bb | 6 + .../recipes-php/xdebug/xdebug_2.6.1.bb | 35 ------ .../recipes-php/xdebug/xdebug_2.7.0RC2.bb | 35 ++++++ .../recipes-webadmin/netdata/netdata_git.bb | 2 + 18 files changed, 184 insertions(+), 164 deletions(-) create mode 100644 meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb create mode 100644 meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb create mode 100644 meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/files/default_server.site create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/files/proxy_params create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.14.2.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.1.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.7.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.1.bb create mode 100644 meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.7.0RC2.bb (limited to 'meta-openembedded/meta-webserver') diff --git a/meta-openembedded/meta-webserver/README b/meta-openembedded/meta-webserver/README index 4d2c7105f..7b6063070 100644 --- a/meta-openembedded/meta-webserver/README +++ b/meta-openembedded/meta-webserver/README @@ -13,14 +13,14 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git subdirectory: meta -branch: thud +branch: master revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-oe.git subdirectory: meta-oe -branch: thud +branch: master revision: HEAD @@ -52,9 +52,9 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-webserver][thud]' in the subject. +with '[meta-webserver]' in the subject. -Thud Maintainer: Armin Kuster +Layer maintainer: Derek Straka License diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf index aaa3a95c4..0d694789f 100644 --- a/meta-openembedded/meta-webserver/conf/layer.conf +++ b/meta-openembedded/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "thud" +LAYERSERIES_COMPAT_webserver = "thud warrior" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb new file mode 100644 index 000000000..a4ce10f67 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-webserver build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb new file mode 100644 index 000000000..ce4f8a038 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb @@ -0,0 +1,3 @@ +require meta-webserver-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-webserver" diff --git a/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb new file mode 100644 index 000000000..fc117850b --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb @@ -0,0 +1,37 @@ +SUMMARY = "Meta-webserver packagegroups" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = ' \ + packagegroup-meta-webserver \ + packagegroup-meta-webserver-http \ + packagegroup-meta-webserver-php \ + packagegroup-meta-webserver-support \ + packagegroup-meta-webserver-webadmin \ +' + +RDEPENDS_packagegroup-meta-webserver = "\ + packagegroup-meta-webserver-http \ + packagegroup-meta-webserver-php \ + packagegroup-meta-webserver-support \ + packagegroup-meta-webserver-webadmin \ +" + +RDEPENDS_packagegroup-meta-webserver-http = "\ + nginx monkey cherokee hiawatha nostromo apache-websocket \ + apache2 sthttpd \ + " + +RDEPENDS_packagegroup-meta-webserver-php = "\ + phpmyadmin xdebug \ + " + +RDEPENDS_packagegroup-meta-webserver-support = "\ + spawn-fcgi fcgi \ + " + +RDEPENDS_packagegroup-meta-webserver-webadmin = "\ + netdata webmin \ + " +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb index a87e3847f..80c8b20d0 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb @@ -31,6 +31,8 @@ S = "${WORKDIR}/httpd-${PV}" inherit autotools update-rc.d pkgconfig systemd update-alternatives +CVE_PRODUCT = "http_server" + ALTERNATIVE_${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/default_server.site b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/default_server.site new file mode 100644 index 000000000..7a8a215cf --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/default_server.site @@ -0,0 +1,14 @@ +# Default server configuration +server { + listen 80 default_server; + listen [::]:80 default_server; + + root /var/www/localhost/html; + + index index.html index.htm; + + server_name _; + + # redirect server error pages to the static page /50x.html + error_page 500 502 503 504 /50x.html; +} diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf index 69d3a2adc..6d219422b 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf @@ -1,118 +1,47 @@ - user www; -worker_processes 1; - -error_log /var/log/nginx/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -pid /run/nginx/nginx.pid; - +worker_processes 1; +pid /run/nginx/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; events { - worker_connections 1024; + worker_connections 768; + # multi_accept on; } - http { - include mime.types; + # Basic Settings + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + # server_tokens off; + + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; + + include /etc/nginx/mime.types; default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - server { - listen 80; - server_name localhost; - - #charset koi8-r; - - #access_log logs/host.access.log main; - - location / { - root /var/www/localhost/html; - index index.html index.htm; - } - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /var/www/localhost/html; - } - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} - } - - - # another virtual host using mix of IP-, name-, and port-based configuration - # - #server { - # listen 8000; - # listen somename:8080; - # server_name somename alias another.alias; - - # location / { - # root html; - # index index.html index.htm; - # } - #} - - - # HTTPS server - # - #server { - # listen 443; - # server_name localhost; - - # ssl on; - # ssl_certificate cert.pem; - # ssl_certificate_key cert.key; + # SSL Settings + ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; - # ssl_session_timeout 5m; + ## Logging + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; - # ssl_protocols SSLv2 SSLv3 TLSv1; - # ssl_ciphers HIGH:!aNULL:!MD5; - # ssl_prefer_server_ciphers on; + ## Gzip settings + gzip on; - # location / { - # root html; - # index index.html index.htm; - # } - #} + gzip_vary on; + gzip_proxied any; + gzip_comp_level 6; + gzip_buffers 16 8k; + gzip_http_version 1.1; + gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + ## Virtual Host Configs + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; } diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service index ce9906171..c6fc0495f 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service @@ -1,11 +1,15 @@ [Unit] -Description=Nginx Server -After=network.target +Description=The NGINX HTTP and reverse proxy server +After=syslog.target network.target remote-fs.target nss-lookup.target + [Service] Type=forking PIDFile=/run/nginx/nginx.pid +ExecStartPre=@SBINDIR@/nginx -t ExecStart=@SBINDIR@/nginx -ExecStop=@SBINDIR@/nginx -s stop ExecReload=@SBINDIR@/nginx -s reload +ExecStop=@BINDIR@/kill -s QUIT $MAINPID +PrivateTmp=true + [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/proxy_params b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/proxy_params new file mode 100644 index 000000000..df75bc5d7 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/proxy_params @@ -0,0 +1,4 @@ +proxy_set_header Host $http_host; +proxy_set_header X-Real-IP $remote_addr; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 24c2cedf5..29e7efc14 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -16,6 +16,8 @@ SRC_URI = " \ file://nginx-cross.patch \ file://0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch \ file://nginx.conf \ + file://default_server.site \ + file://proxy_params \ file://nginx.init \ file://nginx-volatile.conf \ file://nginx.service \ @@ -102,21 +104,37 @@ do_install () { install -d ${D}${sysconfdir}/nginx install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf + sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/nginx/nginx.conf sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf + install -Dm 0644 ${WORKDIR}/default_server.site ${D}${sysconfdir}/nginx/sites-available/default_server + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/sites-available/default_server install -d ${D}${sysconfdir}/nginx/sites-enabled + ln -s ../sites-available/default_server ${D}${sysconfdir}/nginx/sites-enabled/ + + install -m 0644 ${WORKDIR}/proxy_params ${D}${sysconfdir}/nginx/proxy_params install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx sed -i 's,@NGINX_USER@,${NGINX_USER},g' ${D}${sysconfdir}/default/volatiles/99_nginx + # cleanup configuration folder + rm ${D}${sysconfdir}/nginx/*.default + + # add additional configuration folders + install -d ${D}${sysconfdir}/nginx/modules-available + install -d ${D}${sysconfdir}/nginx/modules-enabled + install -d ${D}${sysconfdir}/nginx/server-conf.d + install -d ${D}${sysconfdir}/nginx/conf.d + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@BINDIR@,${bindir},g' \ ${D}${systemd_unitdir}/system/nginx.service fi } diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.14.2.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.14.2.bb new file mode 100644 index 000000000..d0613ffeb --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.14.2.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.14.x branch is the current stable branch, the recommended default +# 1.15.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" + +SRC_URI[md5sum] = "239b829a13cea1d244c1044e830bd9c2" +SRC_URI[sha256sum] = "002d9f6154e331886a2dd4e6065863c9c1cf8291ae97a1255308572c02be9797" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.1.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.1.bb deleted file mode 100644 index 0f1ba8f6b..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.14.x branch is the current stable branch, the recommended default -# 1.15.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" - -SRC_URI[md5sum] = "2dd5a265c54a76b699443931d80a61b9" -SRC_URI[sha256sum] = "c7206858d7f832b8ef73a45c9b8f8e436bcb1ee88db2bc85b8e438ecec9d5460" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb deleted file mode 100644 index 3694f5b58..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" - -SRC_URI[md5sum] = "d063f746d3dc4298aed9c518f1684166" -SRC_URI[sha256sum] = "eeba09aecfbe8277ac33a5a2486ec2d6731739f3c1c701b42a0c3784af67ad90" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.7.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.7.bb new file mode 100644 index 000000000..5e6dc33e9 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.7.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" + +SRC_URI[md5sum] = "719b2e3d416f111fecc9db6625553658" +SRC_URI[sha256sum] = "8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93" diff --git a/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.1.bb b/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.1.bb deleted file mode 100644 index 773dbf33b..000000000 --- a/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Debugging and profiling extension for PHP" -LICENSE = "Xdebug" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16" - -DEPENDS = "php re2c-native" - -SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" - -SRC_URI[md5sum] = "35cc0f2e8b7d40556a9ad9afd9c49aee" -SRC_URI[sha256sum] = "dae691d6c052073b886e0c6e1306a707bca9fd18a1e3485384ef6c4aacf1bd77" - -UPSTREAM_CHECK_REGEX = "xdebug-(?P\d+(\.\d+)+)\.tgz" - -inherit autotools - -EXTRA_OECONF += "--enable-xdebug -with-php-config=${STAGING_BINDIR_CROSS}/php-config" - -do_configure() { - cd ${S} - ${STAGING_BINDIR_CROSS}/phpize - cd ${B} - - # Running autoreconf as autotools_do_configure would do here - # breaks the libtool configuration resulting in a failure later - # in do_compile. It's possible this may be fixable, however the - # easiest course of action for the moment is to avoid doing that. - oe_runconf -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} -} - -FILES_${PN} += "${libdir}/php*/extensions/*/*.so" -FILES_${PN}-dbg += "${libdir}/php*/extensions/*/.debug" diff --git a/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.7.0RC2.bb b/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.7.0RC2.bb new file mode 100644 index 000000000..7be62cb39 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.7.0RC2.bb @@ -0,0 +1,35 @@ +SUMMARY = "Debugging and profiling extension for PHP" +LICENSE = "Xdebug" +LIC_FILES_CHKSUM = "file://LICENSE;md5=92d94a330d34ee6edc2638450736f119" + +DEPENDS = "php re2c-native" + +SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" + +SRC_URI[md5sum] = "e8cabe003d6990b157d0d8caee374844" +SRC_URI[sha256sum] = "5aa6d1772937e9f11b91ad8ced586aa0e16281dc178c405ac380d45d4731f8b0" + +UPSTREAM_CHECK_REGEX = "xdebug-(?P\d+(\.\d+)+)\.tgz" + +inherit autotools + +EXTRA_OECONF += "--enable-xdebug -with-php-config=${STAGING_BINDIR_CROSS}/php-config" + +do_configure() { + cd ${S} + ${STAGING_BINDIR_CROSS}/phpize + cd ${B} + + # Running autoreconf as autotools_do_configure would do here + # breaks the libtool configuration resulting in a failure later + # in do_compile. It's possible this may be fixable, however the + # easiest course of action for the moment is to avoid doing that. + oe_runconf +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} + +FILES_${PN} += "${libdir}/php*/extensions/*/*.so" +FILES_${PN}-dbg += "${libdir}/php*/extensions/*/.debug" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index b0f160252..390fa4ba9 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -27,6 +27,8 @@ DEPENDS += "zlib util-linux" inherit pkgconfig autotools useradd systemd +LDFLAGS += "-pthread" + #systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "netdata.service" -- cgit v1.2.3