diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2017-03-30 17:09:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-31 10:10:29 +0100 |
commit | 271b06d8b988ebc138d73bf4c6b7ba68c3c2fab2 (patch) | |
tree | 090b0d68392bffa9567d54539f2dc9ea63773046 /meta/recipes-extended/net-tools | |
parent | 2a934a3df72bdf7e1e9c27db4cc586a163508b55 (diff) | |
download | poky-271b06d8b988ebc138d73bf4c6b7ba68c3c2fab2.tar.gz |
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).
(From OE-Core rev: 508163bef169cf0d9aa97e73c02d1ecc68480e91)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/net-tools')
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 11 |
1 files changed, 11 insertions, 0 deletions
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 be267351e3..115b3987c3 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,21 @@ python do_patch() { | |||
70 | bb.build.exec_func('patch_do_patch', d) | 70 | bb.build.exec_func('patch_do_patch', d) |
71 | } | 71 | } |
72 | 72 | ||
73 | # i18n only enabled for the target, doesn't build for native | ||
74 | # and isn't needed there. | ||
75 | disable_i18n() { | ||
76 | sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make | ||
77 | } | ||
78 | disable_i18n_class-target () { | ||
79 | : | ||
80 | } | ||
81 | |||
73 | do_configure() { | 82 | do_configure() { |
74 | # net-tools has its own config mechanism requiring "make config" | 83 | # net-tools has its own config mechanism requiring "make config" |
75 | # we pre-generate desired options and copy to source directory instead | 84 | # we pre-generate desired options and copy to source directory instead |
76 | cp ${WORKDIR}/net-tools-config.h ${S}/config.h | 85 | cp ${WORKDIR}/net-tools-config.h ${S}/config.h |
77 | cp ${WORKDIR}/net-tools-config.make ${S}/config.make | 86 | cp ${WORKDIR}/net-tools-config.make ${S}/config.make |
87 | disable_i18n | ||
78 | } | 88 | } |
79 | 89 | ||
80 | do_compile() { | 90 | do_compile() { |
@@ -125,3 +135,4 @@ python __anonymous() { | |||
125 | } | 135 | } |
126 | ALTERNATIVE_PRIORITY = "100" | 136 | ALTERNATIVE_PRIORITY = "100" |
127 | 137 | ||
138 | BBCLASSEXTEND = "native nativesdk" | ||