From 54eca753082af7d4c44379f879945f449d4f56cf Mon Sep 17 00:00:00 2001 From: Bill Randle Date: Mon, 21 Mar 2016 11:24:48 -0700 Subject: poky-sanity.bbclass: update conf/templateconf.cfg for existing installations Updates of existing installations for the meta-yocto to meta-poky transition will update the bblayers.conf file, but not the templateconf.cfg file. This patch updates the template file to point to meta-poky/conf, if necessary. Fixes [YOCTO #9278] (From meta-yocto rev: e560e9b157fd53cccbe73659b44777715660f0b2) Signed-off-by: Bill Randle Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta-poky/conf/bblayers.conf.sample | 2 +- meta-poky/conf/layer.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-poky/conf') diff --git a/meta-poky/conf/bblayers.conf.sample b/meta-poky/conf/bblayers.conf.sample index a371994437..8b1cbdfc5c 100644 --- a/meta-poky/conf/bblayers.conf.sample +++ b/meta-poky/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "1" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" diff --git a/meta-poky/conf/layer.conf b/meta-poky/conf/layer.conf index b5ffd9e686..8b7b33d48c 100644 --- a/meta-poky/conf/layer.conf +++ b/meta-poky/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_yocto = "3" LAYERDEPENDS_yocto = "core" -REQUIRED_POKY_BBLAYERS_CONF_VERSION = "1" +REQUIRED_POKY_BBLAYERS_CONF_VERSION = "2" -- cgit v1.2.3-54-g00ecf