diff options
author | Phil Wise <phil@advancedtelematic.com> | 2017-04-19 13:52:40 +0200 |
---|---|---|
committer | Phil Wise <phil@advancedtelematic.com> | 2017-04-20 12:14:32 +0200 |
commit | 70bad6051c38233884279dfad14e62863efb4827 (patch) | |
tree | e0f016c0c24d8f602093b2d7b1151142453eef45 | |
parent | 41d94be49618bee93d1779625ab304a8c6f82c3b (diff) | |
download | meta-updater-70bad6051c38233884279dfad14e62863efb4827.tar.gz |
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.
-rw-r--r-- | conf/distro/sota.conf.inc | 4 | ||||
-rwxr-xr-x | scripts/envsetup.sh | 1 |
2 files changed, 4 insertions, 1 deletions
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 @@ | |||
1 | DISTRO_FEATURES_append = " sota" | 1 | DISTRO_FEATURES_append = " sota" |
2 | OVERRIDES .= ":sota" | 2 | OVERRIDES .= ":sota" |
3 | 3 | ||
4 | IMAGE_INSTALL_append = " ostree os-release" | 4 | IMAGE_INSTALL_append = " ostree os-release rvi-sota-client" |
5 | 5 | ||
6 | # live image for OSTree-enabled systems | 6 | # live image for OSTree-enabled systems |
7 | IMAGE_CLASSES += "image_types_ostree image_types_ota" | 7 | IMAGE_CLASSES += "image_types_ostree image_types_ota" |
@@ -24,3 +24,5 @@ OSTREE_BRANCHNAME ?= "ota-${MACHINE}" | |||
24 | OSTREE_OSNAME ?= "poky" | 24 | OSTREE_OSNAME ?= "poky" |
25 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" | 25 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" |
26 | 26 | ||
27 | # Prelinking increases the size of downloads and causes build errors | ||
28 | 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 | |||
49 | cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf | 49 | cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf |
50 | echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf | 50 | echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf |
51 | echo "include conf/distro/sota.conf.inc" >> conf/local.conf | 51 | echo "include conf/distro/sota.conf.inc" >> conf/local.conf |
52 | echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf | ||
52 | fi | 53 | fi |
53 | 54 | ||