From 19e06e6584ab2aa31709bcf8fe7b566cafd297e7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 5 Feb 2015 12:05:54 +0000 Subject: poky.conf: resolve mismatch between poky bblayers version and OE-Core Drop our custom LAYER_CONF_VERSION (since the OE-Core version is now the same) and ensure that poky-sanity's update function runs first so that anyone still using version 5 with poky gets the meta-yocto / meta-yocto-bsp split handled instead of OE-Core's no-op upgrade. Also fix the version check so that the poky 5->6 upgrade is still performed if the latest version is greater than 6. NOTE: this of course relies on the corresponding version bump patch in OE-Core. Fixes [YOCTO #6139]. (From meta-yocto rev: 3e4404c73602e8cb9efca0f6f2ec788ff68046eb) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta-yocto/conf/distro/poky.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-yocto/conf') diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index d5bdbac..4591928 100644 --- a/meta-yocto/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf @@ -10,7 +10,6 @@ MAINTAINER = "Poky " TARGET_VENDOR = "-poky" LOCALCONF_VERSION = "1" -LAYER_CONF_VERSION ?= "6" # Override these in poky based distros POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland" -- cgit v1.1