summaryrefslogtreecommitdiffstats
path: root/openembedded/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-02-10 11:45:39 +0000
committerRichard Purdie <richard@openedhand.com>2006-02-10 11:45:39 +0000
commitdd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42 (patch)
treee8b9838dc2981038046081efe5145a4227902f7d /openembedded/conf/distro
parentce241d7e6d8e31411867b5f2127b02c776b39d8a (diff)
downloadpoky-dd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42.tar.gz
Pull conf file updates from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@270 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/distro')
-rw-r--r--openembedded/conf/distro/familiar-0.8.3.conf66
-rw-r--r--openembedded/conf/distro/familiar-distro.conf11
-rw-r--r--openembedded/conf/distro/maemo-1.0.conf2
-rw-r--r--openembedded/conf/distro/openzaurus-3.5.4.conf71
-rw-r--r--openembedded/conf/distro/openzaurus.conf7
-rw-r--r--openembedded/conf/distro/preferred-e-versions.inc32
6 files changed, 31 insertions, 158 deletions
diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf
deleted file mode 100644
index 53614d9291..0000000000
--- a/openembedded/conf/distro/familiar-0.8.3.conf
+++ /dev/null
@@ -1,66 +0,0 @@
1DISTRO = "familiar"
2DISTRO_NAME = "Familiar Linux"
3DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}"
4
5include conf/distro/familiar.conf
6
7"${@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')}"
8
9
10
11DISTRO_TYPE = "debug"
12#DISTRO_TYPE = "release"
13
14FEED_URIS += " \
15 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
16 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
17
18#CVSDATE = 20050331
19
20PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
21PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
22PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
23
24PREFERRED_PROVIDER_virtual/libiconv=glibc
25PREFERRED_PROVIDER_virtual/libintl=glibc
26PREFERRED_PROVIDER_x11=diet-x11
27
28PREFERRED_VERSION_hostap-modules ?= "0.3.9"
29
30# The CSL compiler is unusable because
31# 1) certain programs stop to compile
32# 2) more programs segfault
33PREFERRED_VERSION_gcc ?= "3.4.4"
34PREFERRED_VERSION_gcc-cross ?= "3.4.4"
35PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
36
37#
38# Opie
39#
40
41PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
42PREFERRED_VERSION_qte = "2.3.10"
43
44OPIE_VERSION = "1.2.1"
45include conf/distro/preferred-opie-versions.inc
46
47#
48# GPE
49#
50
51PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
52PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
53PREFERRED_PROVIDER_x11 = "diet-x11"
54
55include conf/distro/preferred-gpe-versions-2.7.inc
56
57#
58# E
59#
60
61
62#23:57 < mickeyl> it's no longer necessary since our cleanup
63#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it
64
65#include conf/distro/preferred-e-versions.inc
66
diff --git a/openembedded/conf/distro/familiar-distro.conf b/openembedded/conf/distro/familiar-distro.conf
deleted file mode 100644
index 497ba6a89c..0000000000
--- a/openembedded/conf/distro/familiar-distro.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1#@TYPE: Distribution
2#@NAME: Familiar Linux
3#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
4
5INHERIT += "package_ipk debian"
6TARGET_OS = "linux"
7
8PARALLEL_INSTALL_MODULES = "1"
9
10UDEV_DEVFS_RULES = "1"
11
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf
index 15ec45f34e..f83e4b1d96 100644
--- a/openembedded/conf/distro/maemo-1.0.conf
+++ b/openembedded/conf/distro/maemo-1.0.conf
@@ -11,7 +11,7 @@ FEED_URIS += " \
11 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ 11 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
12 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" 12 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
13 13
14#CVSDATE = 20050331 14#SRCDATE = 20050331
15 15
16PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" 16PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
17PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" 17PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
deleted file mode 100644
index 8fbcbefa4b..0000000000
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ /dev/null
@@ -1,71 +0,0 @@
1DISTRO = "openzaurus"
2DISTRO_NAME = "OpenZaurus"
3DISTRO_VERSION = "3.5.3-snapshot-${DATE}"
4
5include conf/distro/openzaurus.conf
6
7
8# DISTRO_VERSION = "3.5.4"
9DISTRO_TYPE = "debug"
10# DISTRO_TYPE = "release"
11
12FEED_URIS += " \
13 upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
14upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
15 machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
16 base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
17 libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
18 console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
19 devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
20
21# CVSDATE = "20050704"
22
23#
24# Zaurus
25#
26
27ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
28OEINCLUDELOGS = "yes"
29KERNEL_CONSOLE = "ttyS0"
30#DEBUG_OPTIMIZATION = "-O -g3"
31#DEBUG_BUILD = "1"
32#INHIBIT_PACKAGE_STRIP = "1"
33
34PREFERRED_VERSION_gcc-cross ?= "3.4.4"
35PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
36
37PREFERRED_VERSION_hostap-modules ?= "0.3.9"
38
39#fix some iconv issues, needs to be adjusted when doing uclibc builds
40PREFERRED_PROVIDER_virtual/libiconv=glibc
41PREFERRED_PROVIDER_virtual/libintl=glibc
42
43
44#
45# Base
46#
47PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
48PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
49PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
50PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
51
52#
53# Opie
54#
55PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
56
57OPIE_VERSION = "1.2.1"
58include conf/distro/preferred-opie-versions.inc
59
60#
61# GPE
62#
63PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
64PREFERRED_PROVIDER_x11 = "diet-x11"
65include conf/distro/preferred-gpe-versions-2.7.inc
66
67#
68# E
69#
70#include conf/distro/preferred-e-versions.inc
71
diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf
index a935ed4ac2..edcbacc80e 100644
--- a/openembedded/conf/distro/openzaurus.conf
+++ b/openembedded/conf/distro/openzaurus.conf
@@ -2,12 +2,19 @@
2#@NAME: OpenZaurus 2#@NAME: OpenZaurus
3#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) 3#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
4 4
5DISTRO = "openzaurus"
6DISTRO_NAME = "OpenZaurus"
7
5INHERIT += " package_ipk debian" 8INHERIT += " package_ipk debian"
6# For some reason, this doesn't work 9# For some reason, this doesn't work
7# TARGET_OS ?= "linux" 10# TARGET_OS ?= "linux"
8TARGET_OS = "linux" 11TARGET_OS = "linux"
9TARGET_FPU = "soft" 12TARGET_FPU = "soft"
10 13
14BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
15
11PARALLEL_INSTALL_MODULES = "1" 16PARALLEL_INSTALL_MODULES = "1"
12 17
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')}" 18DISTRO_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')}"
19
20include conf/distro/include/multimachine.conf
diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc
index d861944d53..e4571f1ae6 100644
--- a/openembedded/conf/distro/preferred-e-versions.inc
+++ b/openembedded/conf/distro/preferred-e-versions.inc
@@ -2,12 +2,26 @@
2# Specify which versions of E-related libraries and applications to build 2# Specify which versions of E-related libraries and applications to build
3# 3#
4 4
5PREFERRED_VERSION_ecore = "0.9.9.013" 5PREFERRED_VERSION_e = "0.16.999.023"
6PREFERRED_VERSION_edb = "1.0.5.004" 6PREFERRED_VERSION_ecore-x11 = "0.9.9.023"
7PREFERRED_VERSION_edje = "0.5.0.013" 7PREFERRED_VERSION_ecore-native = "0.9.9.023"
8PREFERRED_VERSION_eet = "0.9.10.013" 8PREFERRED_VERSION_edb = "1.0.5.005"
9PREFERRED_VERSION_embryo = "0.9.1.013" 9PREFERRED_VERSION_edb-native = "1.0.5.005"
10PREFERRED_VERSION_etox = "0.9.0.004" 10PREFERRED_VERSION_edje = "0.5.0.023"
11PREFERRED_VERSION_evas = "0.9.9.013" 11PREFERRED_VERSION_edje-native = "0.5.0.023"
12PREFERRED_VERSION_ewl = "0.0.4.004" 12PREFERRED_VERSION_eet = "0.9.10.023"
13PREFERRED_VERSION_imlib2 = "1.2.1.004" 13PREFERRED_VERSION_eet-native = "0.9.10.023"
14PREFERRED_VERSION_embryo = "0.9.1.023"
15PREFERRED_VERSION_embryo-native = "0.9.1.023"
16PREFERRED_VERSION_emotion = "0.0.1.004"
17PREFERRED_VERSION_emotion-native = "0.0.1.004"
18PREFERRED_VERSION_epeg = "0.9.0.005"
19PREFERRED_VERSION_epsilon = "0.3.0.005"
20PREFERRED_VERSION_esmart-x11 = "0.9.0.005"
21PREFERRED_VERSION_evas-x11 = "0.9.9.023"
22PREFERRED_VERSION_evas-native = "0.9.9.023"
23PREFERRED_VERSION_ewl = "0.0.4.005"
24PREFERRED_VERSION_imlib2-x11 = "1.2.1.010"
25PREFERRED_VERSION_imlib2-native = "1.2.1.010"
26PREFERRED_VERSION_e-wm = "0.16.999.023"
27PREFERRED_VERSION_entrance = "0.9.0.005"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-22 17:48:47 +0000