From ea7da1dd061b7ef4eabd61c6073e6a27709fe972 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Oct 2005 17:20:26 +0000 Subject: More merging with OE. Fix settings-daemon depends. git-svn-id: https://svn.o-hand.com/repos/poky@133 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/distro/familiar-0.8.3.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'openembedded/conf/distro/familiar-0.8.3.conf') diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf index 4b3d33dd9..53614d929 100644 --- a/openembedded/conf/distro/familiar-0.8.3.conf +++ b/openembedded/conf/distro/familiar-0.8.3.conf @@ -1,9 +1,13 @@ -include conf/distro/familiar-distro.conf - DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}" +include conf/distro/familiar.conf + +"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}" + + + DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" -- cgit v1.2.3