From e39692a25858acf79fedf44b9d9fdd8e71337957 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 4 Jul 2017 16:08:15 +0200 Subject: Fix build issues with yocto pyro --- conf/distro/sota.conf.inc | 3 +++ recipes-support/glib-networking/glib-networking_%.bbappend | 7 ++++++- 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 @@ # require conf/distro/sota.conf.inc DISTRO_FEATURES_append = " sota" +DISTRO_FEATURES_NATIVE_append = " sota" INHERIT += " sota" SOTA_CLIENT ?= "aktualizr" # Prelinking increases the size of downloads and causes build errors USER_CLASSES_remove = "image-prelink" + +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 @@ -BBCLASSEXTEND_append_sota = " native" +BBCLASSEXTEND_append_sota = " native nativesdk" + +# Hackery to prevent relocatable_native_pcfiles from crashing +do_install_append_class-native () { + rmdir ${D}${libdir}/pkgconfig +} 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 @@ -BBCLASSEXTEND_append_sota = " native" +BBCLASSEXTEND_append_sota = " native nativesdk" DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}" -- cgit v1.2.3-54-g00ecf