diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
| commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
| tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/nginx/nginx.mk | |
| parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
| parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
| download | buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/nginx/nginx.mk')
| -rw-r--r-- | package/nginx/nginx.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 5a65c5226e..55ae8442fa 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -25,7 +25,7 @@ NGINX_CONF_OPTS = \ # So, we just need to create the directories used by nginx with the right # ownership. define NGINX_PERMISSIONS - /var/lib/nginx d 755 33 33 - - - - - + /var/lib/nginx d 755 33 33 - - - - - endef # disable external libatomic_ops because its detection fails. |
