Patchwork [1/2] xinetd: enable tcp-wrappers support by DISTRO_FEATURE

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Jan. 18, 2013, 2:56 a.m.
Message ID <101e3bb96160957183aaa5770f989757916edaa9.1358477598.git.rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/42835/
State New
Headers show

Comments

rongqing.li@windriver.com - Jan. 18, 2013, 2:56 a.m.
From: "Roy.Li" <rongqing.li@windriver.com>

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Martin Jansa - Jan. 18, 2013, 8:26 a.m.
On Fri, Jan 18, 2013 at 10:56:22AM +0800, rongqing.li@windriver.com wrote:
> From: "Roy.Li" <rongqing.li@windriver.com>
> 
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>  meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
> index 3bde512..9278cc2 100644
> --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
> +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
> @@ -7,7 +7,7 @@ LICENSE = "BSD"
>  LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
>  
>  DEPENDS = ""
> -PR = "r1"
> +PR = "r2"
>  
>  SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
>        file://xinetd.init \
> @@ -28,6 +28,9 @@ INITSCRIPT_PARAMS = "defaults"
>  
>  EXTRA_OECONF="--disable-nls"
>  
> +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers', 'tcp-wrappers', '', d)}"
> +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers', '--with-libwrap', '', d)}"
> +

Why not use PACKAGECONFIG here?

Cheers,

>  do_configure() {
>  	# Looks like configure.in is broken, so we are skipping
>  	# rebuilding configure and are just using the shipped one
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
rongqing.li@windriver.com - Jan. 19, 2013, 4:37 a.m.
On 01/18/2013 04:26 PM, Martin Jansa wrote:
> On Fri, Jan 18, 2013 at 10:56:22AM +0800, rongqing.li@windriver.com wrote:
>> From: "Roy.Li" <rongqing.li@windriver.com>
>>
>> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
>> ---
>>   meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
>> index 3bde512..9278cc2 100644
>> --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
>> +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
>> @@ -7,7 +7,7 @@ LICENSE = "BSD"
>>   LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
>>
>>   DEPENDS = ""
>> -PR = "r1"
>> +PR = "r2"
>>
>>   SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
>>         file://xinetd.init \
>> @@ -28,6 +28,9 @@ INITSCRIPT_PARAMS = "defaults"
>>
>>   EXTRA_OECONF="--disable-nls"
>>
>> +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers', 'tcp-wrappers', '', d)}"
>> +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers', '--with-libwrap', '', d)}"
>> +
>
> Why not use PACKAGECONFIG here?
>

Enabling tcp-wrapper is not a random thing for some customer,
it is a must. So I think feature is more suitable

-Roy

> Cheers,
>
>>   do_configure() {
>>   	# Looks like configure.in is broken, so we are skipping
>>   	# rebuilding configure and are just using the shipped one
>> --
>> 1.7.10.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Saul Wold - Jan. 19, 2013, 4:45 a.m.
On 01/18/2013 08:37 PM, Rongqing Li wrote:
>
>
> On 01/18/2013 04:26 PM, Martin Jansa wrote:
>> On Fri, Jan 18, 2013 at 10:56:22AM +0800, rongqing.li@windriver.com
>> wrote:
>>> From: "Roy.Li" <rongqing.li@windriver.com>
>>>
>>> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
>>> ---
>>>   meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
>>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
>>> b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
>>> index 3bde512..9278cc2 100644
>>> --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
>>> +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
>>> @@ -7,7 +7,7 @@ LICENSE = "BSD"
>>>   LIC_FILES_CHKSUM =
>>> "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
>>>
>>>   DEPENDS = ""
>>> -PR = "r1"
>>> +PR = "r2"
>>>
>>>   SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
>>>         file://xinetd.init \
>>> @@ -28,6 +28,9 @@ INITSCRIPT_PARAMS = "defaults"
>>>
>>>   EXTRA_OECONF="--disable-nls"
>>>
>>> +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers',
>>> 'tcp-wrappers', '', d)}"
>>> +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers',
>>> '--with-libwrap', '', d)}"
>>> +
>>
>> Why not use PACKAGECONFIG here?
>>
>
> Enabling tcp-wrapper is not a random thing for some customer,
> it is a must. So I think feature is more suitable
>
Martin's point is you can use the PACKAGECONFIG syntax here instead of 2 
base_contains.

for example:
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'tcp_wrappers', 
'tcp_wrappers', '', d)}"
PACKAGECONFIG[tcp_wrappers] = "--with-libwrap,--without-libwrap, 
tcp_wrappers"

See docs for more information.

Sau!



> -Roy
>
>> Cheers,
>>
>>>   do_configure() {
>>>       # Looks like configure.in is broken, so we are skipping
>>>       # rebuilding configure and are just using the shipped one
>>> --
>>> 1.7.10.4
>>>
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
rongqing.li@windriver.com - Jan. 19, 2013, 4:53 a.m.
On 01/19/2013 12:45 PM, Saul Wold wrote:
>>>> +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers',
>>>> '--with-libwrap', '', d)}"
>>>> +
>>>
>>> Why not use PACKAGECONFIG here?
>>>
>>
>> Enabling tcp-wrapper is not a random thing for some customer,
>> it is a must. So I think feature is more suitable
>>
> Martin's point is you can use the PACKAGECONFIG syntax here instead of 2
> base_contains.
>
> for example:
> PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'tcp_wrappers',
> 'tcp_wrappers', '', d)}"
> PACKAGECONFIG[tcp_wrappers] = "--with-libwrap,--without-libwrap,
> tcp_wrappers"
>
> See docs for more information.
>
> Sau!

I see, thanks

-Roy

Patch

diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 3bde512..9278cc2 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -7,7 +7,7 @@  LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
 
 DEPENDS = ""
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
       file://xinetd.init \
@@ -28,6 +28,9 @@  INITSCRIPT_PARAMS = "defaults"
 
 EXTRA_OECONF="--disable-nls"
 
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers', 'tcp-wrappers', '', d)}"
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'tcp-wrappers', '--with-libwrap', '', d)}"
+
 do_configure() {
 	# Looks like configure.in is broken, so we are skipping
 	# rebuilding configure and are just using the shipped one