From 70bad6051c38233884279dfad14e62863efb4827 Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Wed, 19 Apr 2017 13:52:40 +0200 Subject: Set default DISTRO, disable prelink Setting the default DISTRO to include systemd means that the rvi-sota-client starts by default, making it work 'out of the box'. image-prelink seems to be broken at the moment, so I've disabled it by default. --- conf/distro/sota.conf.inc | 4 +++- scripts/envsetup.sh | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index a2d8184..a7d3aae 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -1,7 +1,7 @@ DISTRO_FEATURES_append = " sota" OVERRIDES .= ":sota" -IMAGE_INSTALL_append = " ostree os-release" +IMAGE_INSTALL_append = " ostree os-release rvi-sota-client" # live image for OSTree-enabled systems IMAGE_CLASSES += "image_types_ostree image_types_ota" @@ -24,3 +24,5 @@ OSTREE_BRANCHNAME ?= "ota-${MACHINE}" OSTREE_OSNAME ?= "poky" OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" +# Prelinking increases the size of downloads and causes build errors +USER_CLASSES_remove = "image-prelink" diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh index 316a782..6c01d5b 100755 --- a/scripts/envsetup.sh +++ b/scripts/envsetup.sh @@ -49,5 +49,6 @@ else cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf echo "include conf/distro/sota.conf.inc" >> conf/local.conf + echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf fi -- cgit v1.2.3-54-g00ecf