summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/poky-bleeding.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-06-05 22:05:21 +0000
committerRichard Purdie <richard@openedhand.com>2008-06-05 22:05:21 +0000
commitefbf8bc52257a3eb8a486a1b805f659d056625ce (patch)
tree7eb084eb5539dbd08cc51dfffb6fe54f5fd3b06c /meta/conf/distro/poky-bleeding.conf
parentaa6d1a31227cc3fa18aa3469016d7ab01ed9d3f3 (diff)
downloadpoky-efbf8bc52257a3eb8a486a1b805f659d056625ce.tar.gz
poky.conf: Move fixed revisions to a separate file, add floating revisions file merging in older file contents. Set bleeding builds to use the floating revisions.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4594 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/distro/poky-bleeding.conf')
-rw-r--r--meta/conf/distro/poky-bleeding.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index f7865137c4..74b7ca2711 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1 +1,2 @@
1require conf/distro/include/poky-floating-revisions.inc
1require conf/distro/poky.conf 2require conf/distro/poky.conf