[Buildroot] [PATCH 1/1] nginx-dav-ext: New package

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Sun Dec 4 22:52:30 UTC 2016


Hello,

I've applied to master, but after doing a number of changes. See below.

On Tue, 29 Nov 2016 17:47:51 +0100, Johan Oudinet wrote:

> diff --git a/package/nginx-dav-ext/nginx-dav-ext.mk b/package/nginx-dav-ext/nginx-dav-ext.mk
> new file mode 100644
> index 0000000..6c2b3a2
> --- /dev/null
> +++ b/package/nginx-dav-ext/nginx-dav-ext.mk
> @@ -0,0 +1,12 @@
> +################################################################################
> +#
> +# nginx-dav-ext
> +#
> +################################################################################
> +
> +NGINX_DAV_EXT_VERSION = v0.0.3
> +NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,$(NGINX_DAV_EXT_VERSION))
> +

LICENSE and LICENSE_FILES were missing here, so I've added them.

> +NGINX_DAV_EXT_DEPENDENCIES = expat

> diff --git a/package/nginx/Config.in b/package/nginx/Config.in
> index e6f2d96..6f339c7 100644
> --- a/package/nginx/Config.in
> +++ b/package/nginx/Config.in
> @@ -85,6 +85,16 @@ config BR2_PACKAGE_NGINX_HTTP_DAV_MODULE
>  	help
>  	  Enable ngx_http_dav_module
>  
> +if BR2_PACKAGE_NGINX_HTTP_DAV_MODULE
> +
> +config BR2_PACKAGE_NGINX_HTTP_DAV_EXT_MODULE
> +	bool "ngx_http_dav_ext_module"
> +	select BR2_PACKAGE_NGINX_DAV_EXT
> +	help
> +	  Enable ngx_http_dav_ext_module
> +
> +endif # BR2_PACKAGE_NGINX_HTTP_DAV_MODULE

This was not really needed, and we don't do that for other external
nginx modules, so I've dropped this change. Enabling
BR2_PACKAGE_NGINX_DAV_EXT is enough to get this module enabled.

> +ifeq ($(BR2_PACKAGE_NGINX_HTTP_DAV_EXT_MODULE)$(BR2_PACKAGE_NGINX_DAV_EXT),yy)

So I've changed this to just:

ifeq ($(BR2_PACKAGE_NGINX_DAV_EXT),y)

> +NGINX_DEPENDENCIES += nginx-dav-ext
> +NGINX_CONF_OPTS += --add-module=$(NGINX_DAV_EXT_DIR)
> +endif

and moved the whole chunk next to the "upload" external module
handling, so that all external modules are handled in the same place in
nginx.mk.

I've also added a separate patch to add you in the DEVELOPERS file for
nginx-dav-ext (even though you will never receive a build failure about
it, since the build really takes place inside the nginx package).

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com



More information about the buildroot mailing list