summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-07-25 13:44:54 -0400
committerSaul Wold <sgw@linux.intel.com>2011-07-27 09:56:56 -0700
commitf94b781695cd8fa387daff16ecbf3987a0883018 (patch)
tree0a6a4fc2e81ba6fb352cf9875bf59bf209d99de3
parent4a83fb1c2603bc3d4b42ba243163b3fce7c12d9d (diff)
downloadpoky-f94b781695cd8fa387daff16ecbf3987a0883018.tar.gz
poky-f94b781695cd8fa387daff16ecbf3987a0883018.tar.bz2
poky-f94b781695cd8fa387daff16ecbf3987a0883018.zip
poky.conf: explicitly referenced preferred linux-yocto version
As the staging of linux-yocto-3.0 showed, we should explicitly state our preferred version of linux-yocto. This prevents unvalidated changes from being forced into machines. Layers and machines are free to override this as they are updated. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-yocto/conf/distro/poky.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 1ae94a0cd4..88b8adf06f 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -12,6 +12,8 @@ LOCALCONF_VERSION = "1"
DISTRO_FEATURES_append = " largefile"
+PREFERRED_VERSION_linux-yocto ?= "2.6.37+git%"
+
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"