Skip to contentSkip to conversation

define and use tcp-wrappers DISTRO_FEATURE

PATCH Superseded [email protected] 3 participants 9 messages Jan 18, 2013 – Jan 19, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover define and use tcp-wrappers DISTRO_FEATURE

From: "Roy.Li" <[email protected]>

*** BLURB HERE ***
The following changes since commit 98f17da7ccc1bf79fc5894f90e52769bdbcf89df:

update-rc.d: fix failure on target (2013-01-17 20:16:38 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib roy/enable_tcp_wrapper_xinetd
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/enable_tcp_wrapper_xinetd

Roy.Li (2):
xinetd: enable tcp-wrappers support by DISTRO_FEATURE
default-distrovars: add tcp-wrappers to default DISTRO_FEATURES

 meta/conf/distro/include/default-distrovars.inc |    3 ++-
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb   |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/2 xinetd: enable tcp-wrappers support by DISTRO_FEATURE

From: "Roy.Li" <[email protected]>

---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +4 -1
index 3bde512..9278cc2 100644
@@ -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
Signature · 1 line
1.7.10.4
#2 lore raw

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

Quoted 21 lines · On Fri, Jan 18, 2013 at 10:56:22AM +0800, [email protected] wrote:

From: "Roy.Li" <[email protected]>

---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +1 -1
index 3bde512..9278cc2 100644
@@ -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 \

meta/recipes-extended/xinetd/xinetd_2.3.15.bb INITSCRIPT_PARAMS = "defaults" · line 33

Quoted 6 lines
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +3 -0
@@ -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,

Quoted 11 lines
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +0 -0
 do_configure() {
 	# Looks like configure.in is broken, so we are skipping
 	# rebuilding configure and are just using the shipped one
Signature · 7 lines
1.7.10.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

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

Quoted 23 lines · Martin Jansa
Quoted 22 lines · On Fri, Jan 18, 2013 at 10:56:22AM +0800, [email protected] wrote:

From: "Roy.Li" <[email protected]>

---
  meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +1 -1
index 3bde512..9278cc2 100644
@@ -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"
 
Quoted 8 lines

meta/recipes-extended/xinetd/xinetd_2.3.15.bb INITSCRIPT_PARAMS = "defaults" · line 33

Quoted 5 lines
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +3 -0
  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

Quoted 14 lines

Cheers,

Quoted 11 lines
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +0 -1
  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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
Best Reagrds,
Roy | RongQing Li
#4 lore raw

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

Quoted 40 lines · Rongqing Li
Quoted 28 lines · Martin Jansa
Quoted 26 lines · On Fri, Jan 18, 2013 at 10:56:22AM +0800, [email protected] wrote:

From: "Roy.Li" <[email protected]>

---
  meta/recipes-extended/xinetd/xinetd_2.3.15.bb |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +0 -0
index 3bde512..9278cc2 100644
@@ -7,7 +7,7 @@ LICENSE = "BSD"
  LIC_FILES_CHKSUM =

"file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"

DEPENDS = ""

meta/recipes-extended/xinetd/xinetd_2.3.15.bb +1 -1
-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"
 
Quoted 8 lines
Quoted 5 lines
meta/recipes-extended/xinetd/xinetd_2.3.15.bb +1 -0
+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?

Quoted 3 lines

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!

Quoted 17 lines

-Roy

Quoted 14 lines

Cheers,

Quoted 11 lines

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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#5 lore raw

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

Quoted 19 lines · Saul Wold
Quoted 10 lines
Quoted 6 lines
Quoted 3 lines

+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"

Quoted 3 lines

See docs for more information.

Sau!

I see, thanks

-Roy

Signature · 2 lines
Best Reagrds,
Roy | RongQing Li
#6 lore raw

PATCH 2/2 default-distrovars: add tcp-wrappers to default DISTRO_FEATURES

In reply to [email protected]

From: "Roy.Li" <[email protected]>

tcp-wrappers DISTRO_FEATURES only is used in xinetd currently, but other packages maybe need it to enable tcp-wrapper support, like vsftpd.

---
 meta/conf/distro/include/default-distrovars.inc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +2 -1
index 9002fd6..9126825 100644
@@ -19,7 +19,8 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b
 					libc-posix-wchar-io"
 DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
 DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
-DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 tcp-wrappers \
+			${DISTRO_FEATURES_LIBC}"
 
 IMAGE_FEATURES ?= ""
 
Signature · 1 line
1.7.10.4
#7 lore raw

Re: [PATCH 2/2] default-distrovars: add tcp-wrappers to default DISTRO_FEATURES

Quoted 15 lines · On Fri, Jan 18, 2013 at 10:56:23AM +0800, [email protected] wrote:

From: "Roy.Li" <[email protected]>

tcp-wrappers DISTRO_FEATURES only is used in xinetd currently, but other packages maybe need it to enable tcp-wrapper support, like vsftpd.

---
 meta/conf/distro/include/default-distrovars.inc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +0 -0
index 9002fd6..9126825 100644

meta/conf/distro/include/default-distrovars.inc DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b · line 23

Quoted 6 lines
meta/conf/distro/include/default-distrovars.inc +2 -1
@@ -19,7 +19,8 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b
 					libc-posix-wchar-io"
 DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
 DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
-DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 tcp-wrappers \
+			${DISTRO_FEATURES_LIBC}"

DISTRO_FEATURES_BACKFILL maybe?

Quoted 11 lines
meta/conf/distro/include/default-distrovars.inc +0 -0
 IMAGE_FEATURES ?= ""
 
Signature · 7 lines
1.7.10.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#8 lore raw

Re: [PATCH 2/2] default-distrovars: add tcp-wrappers to default DISTRO_FEATURES

Quoted 11 lines · Martin Jansa
Quoted 10 lines · On Fri, Jan 18, 2013 at 10:56:23AM +0800, [email protected] wrote:

From: "Roy.Li" <[email protected]>

tcp-wrappers DISTRO_FEATURES only is used in xinetd currently, but other packages maybe need it to enable tcp-wrapper support, like vsftpd.

---
  meta/conf/distro/include/default-distrovars.inc |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 14 lines

meta/conf/distro/include/default-distrovars.inc DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b · line 23

Quoted 11 lines
meta/conf/distro/include/default-distrovars.inc +2 -1
index 9002fd6..9126825 100644
@@ -19,7 +19,8 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b
  					libc-posix-wchar-io"
  DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
  DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
-DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 tcp-wrappers \
+			${DISTRO_FEATURES_LIBC}"

DISTRO_FEATURES_BACKFILL maybe?

Ok, if no one objects this, I will move it to DISTRO_FEATURES_BACKFILL

Thanks

-Roy

Quoted 12 lines
Quoted 11 lines
meta/conf/distro/include/default-distrovars.inc +0 -1
  IMAGE_FEATURES ?= ""
 
--

1.7.10.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
Best Reagrds,
Roy | RongQing Li