summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf
diff options
context:
space:
mode:
authorBill Randle <william.c.randle@intel.com>2016-03-21 11:24:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-26 07:34:59 +0000
commit54eca753082af7d4c44379f879945f449d4f56cf (patch)
tree595ea9735db3dfd1e46e3b3c22549b902c181eed /meta-poky/conf
parent2b992f3e5633e69fa53850d082ab68f3a4620f77 (diff)
downloadpoky-54eca753082af7d4c44379f879945f449d4f56cf.tar.gz
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 <william.c.randle@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf')
-rw-r--r--meta-poky/conf/bblayers.conf.sample2
-rw-r--r--meta-poky/conf/layer.conf2
2 files changed, 2 insertions, 2 deletions
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 @@
1# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf 1# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
2# changes incompatibly 2# changes incompatibly
3POKY_BBLAYERS_CONF_VERSION = "1" 3POKY_BBLAYERS_CONF_VERSION = "2"
4 4
5BBPATH = "${TOPDIR}" 5BBPATH = "${TOPDIR}"
6BBFILES ?= "" 6BBFILES ?= ""
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"
15 15
16LAYERDEPENDS_yocto = "core" 16LAYERDEPENDS_yocto = "core"
17 17
18REQUIRED_POKY_BBLAYERS_CONF_VERSION = "1" 18REQUIRED_POKY_BBLAYERS_CONF_VERSION = "2"