diff options
author | Anton Gerasimov <anton@advancedtelematic.com> | 2017-07-04 16:08:15 +0200 |
---|---|---|
committer | Anton Gerasimov <anton@advancedtelematic.com> | 2017-07-04 16:08:15 +0200 |
commit | e39692a25858acf79fedf44b9d9fdd8e71337957 (patch) | |
tree | 8057661467ed37db9f567f04af49a56949a84376 | |
parent | 00cf945345a981e9cae155f66bda99e650eb6bf2 (diff) | |
download | meta-updater-e39692a25858acf79fedf44b9d9fdd8e71337957.tar.gz |
Fix build issues with yocto pyro
-rw-r--r-- | conf/distro/sota.conf.inc | 3 | ||||
-rw-r--r-- | recipes-support/glib-networking/glib-networking_%.bbappend | 7 | ||||
-rw-r--r-- | recipes-support/libsoup/libsoup-2.4_%.bbappend | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 07844e3..1775d92 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc | |||
@@ -5,7 +5,10 @@ | |||
5 | # require conf/distro/sota.conf.inc | 5 | # require conf/distro/sota.conf.inc |
6 | 6 | ||
7 | DISTRO_FEATURES_append = " sota" | 7 | DISTRO_FEATURES_append = " sota" |
8 | DISTRO_FEATURES_NATIVE_append = " sota" | ||
8 | INHERIT += " sota" | 9 | INHERIT += " sota" |
9 | SOTA_CLIENT ?= "aktualizr" | 10 | SOTA_CLIENT ?= "aktualizr" |
10 | # Prelinking increases the size of downloads and causes build errors | 11 | # Prelinking increases the size of downloads and causes build errors |
11 | USER_CLASSES_remove = "image-prelink" | 12 | USER_CLASSES_remove = "image-prelink" |
13 | |||
14 | HOSTTOOLS_append = " sync sha256sum" | ||
diff --git a/recipes-support/glib-networking/glib-networking_%.bbappend b/recipes-support/glib-networking/glib-networking_%.bbappend index fccb949..1c4fe19 100644 --- a/recipes-support/glib-networking/glib-networking_%.bbappend +++ b/recipes-support/glib-networking/glib-networking_%.bbappend | |||
@@ -1 +1,6 @@ | |||
1 | BBCLASSEXTEND_append_sota = " native" | 1 | BBCLASSEXTEND_append_sota = " native nativesdk" |
2 | |||
3 | # Hackery to prevent relocatable_native_pcfiles from crashing | ||
4 | do_install_append_class-native () { | ||
5 | rmdir ${D}${libdir}/pkgconfig | ||
6 | } | ||
diff --git a/recipes-support/libsoup/libsoup-2.4_%.bbappend b/recipes-support/libsoup/libsoup-2.4_%.bbappend index ce4df6d..18383f1 100644 --- a/recipes-support/libsoup/libsoup-2.4_%.bbappend +++ b/recipes-support/libsoup/libsoup-2.4_%.bbappend | |||
@@ -1,3 +1,3 @@ | |||
1 | BBCLASSEXTEND_append_sota = " native" | 1 | BBCLASSEXTEND_append_sota = " native nativesdk" |
2 | 2 | ||
3 | DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}" | 3 | DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}" |