summaryrefslogtreecommitdiffstats
path: root/openembedded/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-11-04 12:28:48 +0000
committerRichard Purdie <richard@openedhand.com>2005-11-04 12:28:48 +0000
commitab13c9bab3f0000579470f223cd92988686ddd70 (patch)
tree946a75c3601fb58888fa7899d64c5569b7977dc2 /openembedded/conf
parent1b7578fafb7deb9760653357d16fee8009d8b45a (diff)
downloadpoky-ab13c9bab3f0000579470f223cd92988686ddd70.tar.gz
More merging from OE
git-svn-id: https://svn.o-hand.com/repos/poky@172 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
-rw-r--r--openembedded/conf/bitbake.conf2
-rw-r--r--openembedded/conf/distro/openzaurus-3.5.4.conf15
-rw-r--r--openembedded/conf/distro/openzaurus.conf1
-rw-r--r--openembedded/conf/distro/preferred-gpe-versions.inc84
4 files changed, 10 insertions, 92 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 3ad1b703f5..06d9e61ac5 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -295,7 +295,7 @@ GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
295XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" 295XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
296GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" 296GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
297FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" 297FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
298HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs" 298HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
299 299
300# You can use the mirror of your country to get faster downloads by putting 300# You can use the mirror of your country to get faster downloads by putting
301# export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" 301# export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
index d7780e8605..10214614f9 100644
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ b/openembedded/conf/distro/openzaurus-3.5.4.conf
@@ -10,12 +10,13 @@ DISTRO_TYPE = "debug"
10# DISTRO_TYPE = "release" 10# DISTRO_TYPE = "release"
11 11
12FEED_URIS += " \ 12FEED_URIS += " \
13 upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ \ 13 upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
14 machine##http://openzaurus.org/official/unstable/3.5.3/feed/machine/${MACHINE} \ 14upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
15 base##http://openzaurus.org/official/unstable/3.5.3/feed/base/ \ 15 machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
16 libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/ \ 16 base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
17 console##http://openzaurus.org/official/unstable/3.5.3/feed/console \ 17 libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
18 devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel" 18 console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
19 devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
19 20
20# CVSDATE = "20050704" 21# CVSDATE = "20050704"
21 22
@@ -68,4 +69,4 @@ include conf/distro/preferred-gpe-versions-2.7.inc
68# 69#
69#include conf/distro/preferred-e-versions.inc 70#include conf/distro/preferred-e-versions.inc
70 71
71include conf/distro/poky-additions.inc \ No newline at end of file 72include conf/distro/poky-additions.inc
diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf
index 9208aeda09..a935ed4ac2 100644
--- a/openembedded/conf/distro/openzaurus.conf
+++ b/openembedded/conf/distro/openzaurus.conf
@@ -10,3 +10,4 @@ TARGET_FPU = "soft"
10 10
11PARALLEL_INSTALL_MODULES = "1" 11PARALLEL_INSTALL_MODULES = "1"
12 12
13DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/openembedded/conf/distro/preferred-gpe-versions.inc b/openembedded/conf/distro/preferred-gpe-versions.inc
deleted file mode 100644
index de4fdb15bf..0000000000
--- a/openembedded/conf/distro/preferred-gpe-versions.inc
+++ /dev/null
@@ -1,84 +0,0 @@
1#
2# Specify which versions of GPE (and related) applications to build
3#
4
5#work around some breakages
6#CVSDATE_xext=20050222
7
8#set some preferred providers:
9#PREFERRED_PROVIDER_gconf=gconf-dbus
10PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
11
12#specify versions, as the header says :)
13#PREFERRED_VERSION_libmatchbox ?= "1.6"
14#PREFERRED_VERSION_matchbox ?= "0.9.1"
15#PREFERRED_VERSION_matchbox-common ?= "0.9.1"
16#PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
17#PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
18#PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
19#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
20#PREFERRED_VERSION_gtk+ ?= "2.6.3"
21#PREFERRED_VERSION_libgpewidget ?= "0.97"
22#PREFERRED_VERSION_libgpepimc ?= "0.4"
23#PREFERRED_VERSION_libgpevtype ?= "0.11"
24#PREFERRED_VERSION_libschedule ?= "0.14"
25#PREFERRED_VERSION_gpe-icons ?= "0.24"
26#PREFERRED_VERSION_libgsm ?= "1.0.10"
27PREFERRED_VERSION_diet-x11 ?= "6.2.1"
28PREFERRED_VERSION_xproto ?= "6.6.2"
29#PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
30PREFERRED_VERSION_rxvt-unicode ?= "5.3"
31#PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
32#PREFERRED_VERSION_xst ?= "0.14"
33PREFERRED_VERSION_xextensions ?= "1.0.1"
34PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
35PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
36PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
37#PREFERRED_VERSION_gpe-login ?= "0.76"
38#PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
39#PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
40#PREFERRED_VERSION_gpe-todo ?= "0.50"
41#PREFERRED_VERSION_gpe-calendar ?= "0.61"
42#PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
43#PREFERRED_VERSION_gpe-contacts ?= "0.36"
44#PREFERRED_VERSION_gpe-today ?= "0.08"
45#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
46PREFERRED_VERSION_dbus ?= "0.23.4"
47#PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
48#PREFERRED_VERSION_gpe-su ?= "0.18"
49#PREFERRED_VERSION_gpe-conf ?= "0.1.23"
50#PREFERRED_VERSION_gpe-clock ?= "0.20"
51#PREFERRED_VERSION_gpe-mininet ?= "0.5"
52#PREFERRED_VERSION_gpe-mixer ?= "0.40"
53#PREFERRED_VERSION_gpe-shield ?= "0.7"
54#PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
55#PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
56#PREFERRED_VERSION_keylaunch ?= "2.0.7"
57#PREFERRED_VERSION_minilite ?= "0.47"
58#PREFERRED_VERSION_xmonobut ?= "0.4"
59#PREFERRED_VERSION_gpe-edit ?= "0.28"
60#PREFERRED_VERSION_gpe-gallery ?= "0.95"
61#PREFERRED_VERSION_gpe-calculator ?= "0.2"
62#PREFERRED_VERSION_gpe-package ?= "0.2"
63#PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
64#PREFERRED_VERSION_gpe-terminal ?= "1.1"
65#PREFERRED_VERSION_gpe-watch ?= "0.10"
66#PREFERRED_VERSION_gpe-what ?= "0.33"
67#PREFERRED_VERSION_gpe-filemanager ?= "0.20"
68#PREFERRED_VERSION_gpe-go ?= "0.05"
69#PREFERRED_VERSION_gpe-irc ?= "0.07"
70#PREFERRED_VERSION_gpe-lights ?= "0.13"
71#PREFERRED_VERSION_gpe-nmf ?= "0.19"
72#PREFERRED_VERSION_gpe-othello ?= "0.2-1"
73#PREFERRED_VERSION_gpe-plucker ?= "0.2"
74#PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
75#PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
76#PREFERRED_VERSION_xdemineur ?= "2.1.1"
77#PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
78PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
79#PREFERRED_VERSION_dillo2 ?= "0.6.6"
80PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
81#PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
82#PREFERRED_VERSION_linphone ?= "0.12.2"
83#PREFERRED_VERSION_firefox ?= "1.0"
84