[oe-commits] [meta-openembedded] 12/15: 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 ed35b3c3bb34049fd7ede07b8bf860fde60860e6
Author: Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Mon Feb 29 09:43:11 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: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb
index 73b4832..16dec27 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.bb
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.11.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"
+
 SRC_URI[md5sum] = "76eb5853a1190e0cfc691aa21c545de3"
 SRC_URI[sha256sum] = "6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee8714e7b368a51f"
 

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