[oe-commits] [meta-openembedded] 09/36: nginx: make the 1.8.x branch the default

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 1785d45e420644df122e235f5d080889631bf3f7
Author: Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Mon Mar 14 11:23:14 2016 +0100

    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 at siemens.com>
---
 meta-webserver/recipes-httpd/nginx/nginx_1.9.12.bb | 4 ++++
 1 file changed, 4 insertions(+)

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 6c90646..dabdb28 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.