aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2016-03-14 11:23:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-25 11:26:57 +0100
commitd269bb24de55a1b9cffae2336ba6db56d7935c62 (patch)
treec57bb5c07918e593f2314ebf7369a79d196b8d17 /meta-webserver
parent6605e7f52f5880c0dd4eb87e514d42827ee58050 (diff)
downloadmeta-openembedded-contrib-d269bb24de55a1b9cffae2336ba6db56d7935c62.tar.gz
nginx: make the 1.8.x branch the default
The 1.9.x branch is still supported but it needs to be explicitly selected. Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx_1.9.12.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.12.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.12.bb
index 6c90646004..dabdb28fd6 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.12.bb
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.12.bb
@@ -1,5 +1,9 @@
require nginx.inc
+# 1.9.x is the current mainline branches containing all new features
+# 1.8.x branch is the current stable branch, the recommended default
+DEFAULT_PREFERENCE = "-1"
+
LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023"
SRC_URI[md5sum] = "0afe4a7e589a0de43b7b54aa055a4351"