From: Phil Wise <phil@advancedtelematic.com>
Date: Tue, 23 May 2017 13:56:41 +0000 (+0200)
Subject: Enable OTA updates using inc from meta-updater
X-Git-Tag: 4.99.1~110
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=560fc09edd3e95e2246adf03f2d534143bfbfe9f;p=AGL%2Fmeta-agl.git

Enable OTA updates using inc from meta-updater

The latest meta-updater provides an include file to enable OTA
updates--use that to bring in the relevant configuration.
rvi-sota-client is not pulled in by default, so delete the
IMAGE_INSTALL_remove line.

Change-Id: I148dc1b0156f6ea12a456bd093a32945215852e7
Signed-off-by: Phil Wise <phil@advancedtelematic.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9801
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Reviewed-by: Leon Anavi <leon.anavi@konsulko.com>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---

diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 29548aefa..42ff6bc1c 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,2 +1,2 @@
 #see meta-updater/conf/distro/sota.conf.inc
-INHERIT += " sota"
+require conf/distro/sota.conf.inc