From cf36fad0b1f2542f04d1b4800c0a4cd593c51dcf Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 22 May 2018 17:53:08 +0200 Subject: Include fix for qemu in sota_qemux86-64.bbclass --- README.adoc | 6 ------ classes/sota_qemux86-64.bbclass | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.adoc b/README.adoc index c47dd1d..75ee9ae 100644 --- a/README.adoc +++ b/README.adoc @@ -53,12 +53,6 @@ Although `aglsetup.sh` hooks provide reasonable defaults for SOTA-related variab === Build problems -Multilib systems may require adding this line to `local.conf`: - -.... -HOSTTOOLS += "x86_64-linux-gnu-gcc" -.... - Ubuntu users that encounter an error due to missing `Python.h` should install `libpython2.7-dev` on their host machine. == Supported boards diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index 15b2043..82efe52 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass @@ -9,3 +9,6 @@ OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz" OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '65536', '', d)}" + +# fix for u-boot/swig build issue +HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" -- cgit v1.2.3-54-g00ecf From a1fbc691aefbc2b29476b5561bd2e7220217235b Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 23 May 2018 14:49:02 +0200 Subject: ostree: Don't use autotools-brokensep. The only reason we needed it was because of a relative path that I've now made absolute. --- recipes-sota/ostree/ostree_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index cdcb485..bfe16e9 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -inherit autotools-brokensep pkgconfig systemd gobject-introspection +inherit autotools pkgconfig systemd gobject-introspection INHERIT_remove_class-native = "systemd" @@ -49,7 +49,7 @@ export STAGING_LIBDIR do_configure() { unset docdir - NOCONFIGURE=1 ./autogen.sh + NOCONFIGURE=1 "${S}/autogen.sh" oe_runconf } -- cgit v1.2.3-54-g00ecf