diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-10-11 17:20:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-10-11 17:20:26 +0000 |
| commit | ea7da1dd061b7ef4eabd61c6073e6a27709fe972 (patch) | |
| tree | 46f9ce0ed02ec3fc4d82b3e660d7a3a81627243a /openembedded/conf/distro | |
| parent | 42974a1e1288e787cb4d5bb66acba691b06209ca (diff) | |
| download | openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.gz openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.bz2 openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.xz openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.zip | |
More merging with OE. Fix settings-daemon depends.
git-svn-id: https://svn.o-hand.com/repos/poky@133 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/distro')
| -rw-r--r-- | openembedded/conf/distro/familiar-0.8.3.conf | 8 | ||||
| -rw-r--r-- | openembedded/conf/distro/openzaurus-3.5.4.conf | 5 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions-2.7.inc | 6 |
3 files changed, 13 insertions, 6 deletions
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" diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf index fbc197086..d7780e860 100644 --- a/openembedded/conf/distro/openzaurus-3.5.4.conf +++ b/openembedded/conf/distro/openzaurus-3.5.4.conf @@ -1,7 +1,10 @@ -include conf/distro/openzaurus.inc DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" DISTRO_VERSION = "3.5.3-snapshot-${DATE}" + +include conf/distro/openzaurus.conf + + # DISTRO_VERSION = "3.5.4" DISTRO_TYPE = "debug" # DISTRO_TYPE = "release" diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc index f24a46a37..561bc79c0 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc @@ -27,7 +27,7 @@ PREFERRED_VERSION_libgpewidget ?= "0.103" PREFERRED_VERSION_libgpepimc ?= "0.5" PREFERRED_VERSION_libgpevtype ?= "0.12" PREFERRED_VERSION_libschedule ?= "0.15" -PREFERRED_VERSION_gpe-icons ?= "0.24" +PREFERRED_VERSION_gpe-icons ?= "0.25" PREFERRED_VERSION_libgsm ?= "1.0.10" PREFERRED_VERSION_diet-x11 ?= "6.2.1" PREFERRED_VERSION_xproto ?= "6.6.2" @@ -39,14 +39,14 @@ PREFERRED_VERSION_xst ?= "0.15" PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_gpe-login ?= "0.82" +PREFERRED_VERSION_gpe-login ?= "0.83" PREFERRED_VERSION_gpe-session-scripts ?= "0.66" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" PREFERRED_VERSION_gpe-calendar ?= "0.65" PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" PREFERRED_VERSION_gpe-contacts ?= "0.42" -PREFERRED_VERSION_gpe-today ?= "0.09" +PREFERRED_VERSION_gpe-today ?= "0.10" PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" PREFERRED_VERSION_gpe-beam ?= "0.2.8" |