From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc | 7 +++++-- .../meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb | 6 ------ .../meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb | 10 ---------- .../meta-webserver/recipes-httpd/nginx/nginx_1.15.1.bb | 10 ++++++++++ .../meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb | 6 ++++++ 5 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.1.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb (limited to 'meta-openembedded/meta-webserver/recipes-httpd/nginx') diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index e6ae52a09..24c2cedf5 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -9,7 +9,7 @@ LICENSE = "BSD-2-Clause" SECTION = "net" -DEPENDS = "libpcre zlib openssl" +DEPENDS = "libpcre zlib" SRC_URI = " \ http://nginx.org/download/nginx-${PV}.tar.gz \ @@ -34,7 +34,10 @@ NGINX_USER ?= "www" EXTRA_OECONF = "" DISABLE_STATIC = "" +PACKAGECONFIG ??= "ssl" + PACKAGECONFIG[http2] = "--with-http_v2_module,," +PACKAGECONFIG[ssl] = "--with-http_ssl_module,,openssl" do_configure () { if [ "${SITEINFO_BITS}" = "64" ]; then @@ -71,7 +74,7 @@ do_configure () { --http-scgi-temp-path=/run/nginx/scgi_temp \ --pid-path=/run/nginx/nginx.pid \ --prefix=${prefix} \ - --with-http_ssl_module \ + --with-threads \ --with-http_gzip_static_module \ ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} } diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb deleted file mode 100644 index 85ad29b08..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=903753de5f86a1ee0341fd2f9491b282" - -SRC_URI[md5sum] = "4d2fc76211435f029271f1cf6d7eeae3" -SRC_URI[sha256sum] = "305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb deleted file mode 100644 index 923479447..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.12.x branch is the current stable branch, the recommended default -# 1.13.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" - -SRC_URI[md5sum] = "dcd482dd98d2022659212f183e8fe81b" -SRC_URI[sha256sum] = "5faea18857516fe68d30be39c3032bd22ed9cf85e1a6fdf32e3721d96ff7fa42" 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 new file mode 100644 index 000000000..0f1ba8f6b --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.1.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] = "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 new file mode 100644 index 000000000..3694f5b58 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe" + +SRC_URI[md5sum] = "d063f746d3dc4298aed9c518f1684166" +SRC_URI[sha256sum] = "eeba09aecfbe8277ac33a5a2486ec2d6731739f3c1c701b42a0c3784af67ad90" -- cgit v1.2.3