* [PATCH] apache2: include .load files in modules.d
@ 2016-10-31 8:42 Junxian.Xiao
2016-10-31 8:58 ` Robert Yang
0 siblings, 1 reply; 5+ messages in thread
From: Junxian.Xiao @ 2016-10-31 8:42 UTC (permalink / raw)
To: openembedded-core
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.
Signed-off-by: Junxian.Xiao <Junxian.Xiao@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] apache2: include .load files in modules.d
@ 2016-10-31 8:47 Junxian.Xiao
2016-10-31 8:47 ` [meta-webserver][PATCH] " Junxian.Xiao
2016-11-01 18:12 ` [PATCH] " Martin Jansa
0 siblings, 2 replies; 5+ messages in thread
From: Junxian.Xiao @ 2016-10-31 8:47 UTC (permalink / raw)
To: openembedded-devel
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.
Signed-off-by: Junxian.Xiao <Junxian.Xiao@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-webserver][PATCH] apache2: include .load files in modules.d
2016-10-31 8:47 [PATCH] apache2: include .load files in modules.d Junxian.Xiao
@ 2016-10-31 8:47 ` Junxian.Xiao
2016-11-01 18:12 ` [PATCH] " Martin Jansa
1 sibling, 0 replies; 5+ messages in thread
From: Junxian.Xiao @ 2016-10-31 8:47 UTC (permalink / raw)
To: openembedded-devel
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.
(LOCAL REV: NOT UPSTREAM) -- sent to oe-devel on 20161031
Signed-off-by: Junxian.Xiao <Junxian.Xiao@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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] apache2: include .load files in modules.d
2016-10-31 8:42 Junxian.Xiao
@ 2016-10-31 8:58 ` Robert Yang
0 siblings, 0 replies; 5+ messages in thread
From: Robert Yang @ 2016-10-31 8:58 UTC (permalink / raw)
To: Junxian.Xiao, openembedded-core
Hi Junxian,
This should go into openembedded-devel@lists.openembedded.org
Please see README in each layer of meta-openembedded to see how to
send patches.
// Robert
On 10/31/2016 04:42 PM, 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.
>
> Signed-off-by: Junxian.Xiao <Junxian.Xiao@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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] apache2: include .load files in modules.d
2016-10-31 8:47 [PATCH] apache2: include .load files in modules.d Junxian.Xiao
2016-10-31 8:47 ` [meta-webserver][PATCH] " Junxian.Xiao
@ 2016-11-01 18:12 ` Martin Jansa
1 sibling, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2016-11-01 18:12 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2615 bytes --]
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@asterius.io>
AuthorDate: Wed Jul 13 08:46:59 2016 -0400
Commit: Martin Jansa <Martin.Jansa@gmail.com>
CommitDate: Fri Jul 29 11:00:55 2016 +0200
apache2: update to version 2.4.23
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
REBASE and retest before sending changes!
> Signed-off-by: Junxian.Xiao <Junxian.Xiao@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-11-01 18:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-31 8:47 [PATCH] apache2: include .load files in modules.d Junxian.Xiao
2016-10-31 8:47 ` [meta-webserver][PATCH] " Junxian.Xiao
2016-11-01 18:12 ` [PATCH] " Martin Jansa
-- strict thread matches above, loose matches on Subject: below --
2016-10-31 8:42 Junxian.Xiao
2016-10-31 8:58 ` Robert Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.