[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5401/8267] net-tools: enable native and nativesdk variant
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 5401/8267] net-tools: enable native and nativesdk variant
- Date: Sun, 17 Dec 2017 03:23:18 +0000 (UTC)
commit 271b06d8b988ebc138d73bf4c6b7ba68c3c2fab2
Author: Patrick Ohly <patrick ohly intel com>
Date: 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).
(From OE-Core rev: 508163bef169cf0d9aa97e73c02d1ecc68480e91)
Signed-off-by: Patrick Ohly <patrick ohly intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
.../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 be26735..115b398 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() {
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 +135,4 @@ python __anonymous() {
}
ALTERNATIVE_PRIORITY = "100"
+BBCLASSEXTEND = "native nativesdk"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]