[PATCH] net-tools: enable native and nativesdk variant

[PATCH] net-tools: enable native and nativesdk variant

[Patrick Ohly]

net-tools-native is needed by swtpm-wrappers (in meta-security)
because swtpm_setup.sh calls netstat, which cannot be assumed to be
present in all Linux installations (for example, it is not in OpenSUSE
minimal base).

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index be26735..4152a4f 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -70,11 +70,20 @@ python do_patch() {
     bb.build.exec_func('patch_do_patch', d)
 }
 
+# i18n only enabled for the target, doesn't build for native
+# and isn't needed there.
+disable_i18n() {
+	sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make
+}
+disable_i18n_class-target () {
+}
+
 do_configure() {
 	# net-tools has its own config mechanism requiring "make config"
 	# we pre-generate desired options and copy to source directory instead
 	cp ${WORKDIR}/net-tools-config.h    ${S}/config.h
 	cp ${WORKDIR}/net-tools-config.make ${S}/config.make
+	disable_i18n
 }
 
 do_compile() {
@@ -125,3 +134,4 @@ python __anonymous() {
 }
 ALTERNATIVE_PRIORITY = "100"
 
+BBCLASSEXTEND = "native nativesdk"

base-commit: e4f5d88b8e69964c40e7011c1e7f33f6484b9090
-- 
git-series 0.9.1

Re: [PATCH] net-tools: enable native and nativesdk variant

[Stephano Cetola]

This won't work, and it is failing on the ab.

https://autobuilder.yoctoproject.org/main/builders/nightly-no-x11/builds/449/steps/BuildImages/logs/stdio

Just add a 'return' to your empty bash function and it'll work fine.

Cheers,
Stephano

On 03/30, Patrick Ohly wrote:
> net-tools-native is needed by swtpm-wrappers (in meta-security)
> because swtpm_setup.sh calls netstat, which cannot be assumed to be
> present in all Linux installations (for example, it is not in OpenSUSE
> minimal base).
> 
> Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
> ---
>  meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> index be26735..4152a4f 100644
> --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
> @@ -70,11 +70,20 @@ python do_patch() {
>      bb.build.exec_func('patch_do_patch', d)
>  }
>  
> +# i18n only enabled for the target, doesn't build for native
> +# and isn't needed there.
> +disable_i18n() {
> +	sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make
> +}
> +disable_i18n_class-target () {
> +}
> +
>  do_configure() {
>  	# net-tools has its own config mechanism requiring "make config"
>  	# we pre-generate desired options and copy to source directory instead
>  	cp ${WORKDIR}/net-tools-config.h    ${S}/config.h
>  	cp ${WORKDIR}/net-tools-config.make ${S}/config.make
> +	disable_i18n
>  }
>  
>  do_compile() {
> @@ -125,3 +134,4 @@ python __anonymous() {
>  }
>  ALTERNATIVE_PRIORITY = "100"
>  
> +BBCLASSEXTEND = "native nativesdk"
> 
> base-commit: e4f5d88b8e69964c40e7011c1e7f33f6484b9090
> -- 
> git-series 0.9.1
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH] net-tools: enable native and nativesdk variant

[Richard Purdie]

On Thu, 2017-03-30 at 14:47 -0700, Stephano Cetola wrote:
> This won't work, and it is failing on the ab.
> 
> https://autobuilder.yoctoproject.org/main/builders/nightly-no-x11/bui
> lds/449/steps/BuildImages/logs/stdio
> 
> Just add a 'return' to your empty bash function and it'll work fine.

I tweaked the empty function to contain ":" and have updated -next
since I could do with a retest with minimal delta.

Cheers,

Richard