[oe-commits] [openembedded-core] 01/04: net-tools: enable native and nativesdk variant

git at git.openembedded.org git at git.openembedded.org
Thu Mar 30 15:57:55 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit db3fa5e64f49f3fb15ea0080c4ec3cd4385c26b2
Author: Patrick Ohly <patrick.ohly at intel.com>
AuthorDate: Thu Mar 30 17:09:36 2017 +0200

    net-tools: enable native and nativesdk variant
    
    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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list