[oe] [PATCH] apache2: include .load files in modules.d

[Martin Jansa]

On Mon, Oct 31, 2016 at 04:47:01PM +0800, Junxian.Xiao wrote:
> Issue: LIN8-5007
> 
> According to other linux distributes like ubuntu, the modules
> are usually included by 'LoadModule' command in *.load files
> in mods-enable directory, and *.conf files in this directory
> are for special configurations for each module.
> 
> The stucture of the files tree is not the same in yocto, so this
> may be not the rule that we must follow. But still add *.load to
> be compatible with customer's normal usage habits.

OE @ ~/meta-openembedded $ pwam 133390
2016-11-01 19:10:52
URL:https://patchwork.openembedded.org/patch/133390/mbox/ [1933] ->
"pw-am-133390.patch" [1]
Applying: apache2: include .load files in modules.d
error: meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb: does not
exist in index

commit 7707dd5bc82583e4cc41ae3080b40d0d6ede8a45
Author:     Derek Straka <derek at asterius.io>
AuthorDate: Wed Jul 13 08:46:59 2016 -0400
Commit:     Martin Jansa <Martin.Jansa at gmail.com>
CommitDate: Fri Jul 29 11:00:55 2016 +0200

    apache2: update to version 2.4.23
    
    Signed-off-by: Derek Straka <derek at asterius.io>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>


REBASE and retest before sending changes!

> Signed-off-by: Junxian.Xiao <Junxian.Xiao at windriver.com>
> ---
>  .../recipes-httpd/apache2/apache2_2.4.16.bb        |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
> index 4aacff1..52127c2 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
> @@ -81,6 +81,7 @@ do_install_append() {
>  
>      # Ensure configuration file pulls in conf.d and modules.d
>      printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
> +    printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
>      printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
>      # match with that is in init script
>      printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
> -- 
> 1.7.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20161101/73ddbda5/attachment-0002.sig>