summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-08-27 16:13:31 +0000
committerRichard Purdie <richard@openedhand.com>2006-08-27 16:13:31 +0000
commit72906f5da46e7f53070fba999457b9affb76e696 (patch)
treea8f3a6f376c94ce9763e1afd9c222c81d8cbcfe1
parent93a8d0662ed361c76defe75a5cd84f203fdb1af1 (diff)
downloadpoky-72906f5da46e7f53070fba999457b9affb76e696.tar.gz
conf/distro: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@652 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--meta/conf/distro/angstrom-2007.1.conf (renamed from meta/conf/distro/angstrom-2006.9.conf)90
-rw-r--r--meta/conf/distro/familiar-unstable.conf26
-rw-r--r--meta/conf/distro/include/angstrom.inc (renamed from meta/conf/distro/angstrom.conf)15
-rw-r--r--meta/conf/distro/include/familar.inc (renamed from meta/conf/distro/familiar.conf)0
-rw-r--r--meta/conf/distro/include/maemo-preferred.inc (renamed from meta/conf/distro/maemo-preferred.inc)0
-rw-r--r--meta/conf/distro/include/openzaurus.inc (renamed from meta/conf/distro/openzaurus.conf)4
-rw-r--r--meta/conf/distro/include/poky-eabi.inc (renamed from meta/conf/distro/poky-eabi.conf)0
-rw-r--r--meta/conf/distro/include/poky-eabi2.inc (renamed from meta/conf/distro/poky-eabi2.conf)0
-rw-r--r--meta/conf/distro/include/poky-oabi.inc (renamed from meta/conf/distro/poky-oabi.conf)0
-rw-r--r--meta/conf/distro/include/preferred-e-versions.inc (renamed from meta/conf/distro/preferred-e-versions.inc)0
-rw-r--r--meta/conf/distro/include/preferred-gpe-versions-2.7.inc (renamed from meta/conf/distro/preferred-gpe-versions-2.7.inc)2
-rw-r--r--meta/conf/distro/include/preferred-opie-versions.inc (renamed from meta/conf/distro/preferred-opie-versions.inc)3
-rw-r--r--meta/conf/distro/include/sane-srcdates.inc85
-rw-r--r--meta/conf/distro/maemo-1.0.conf12
-rw-r--r--meta/conf/distro/openzaurus-unstable.conf28
-rw-r--r--meta/conf/distro/poky.conf2
16 files changed, 211 insertions, 56 deletions
diff --git a/meta/conf/distro/angstrom-2006.9.conf b/meta/conf/distro/angstrom-2007.1.conf
index 5c1ed1296d..327d4123cc 100644
--- a/meta/conf/distro/angstrom-2006.9.conf
+++ b/meta/conf/distro/angstrom-2007.1.conf
@@ -9,7 +9,8 @@
9#DISTRO_VERSION = "2006.9" 9#DISTRO_VERSION = "2006.9"
10DISTRO_VERSION = "test-${DATE}" 10DISTRO_VERSION = "test-${DATE}"
11 11
12include conf/distro/angstrom.conf 12require conf/distro/include/angstrom.inc
13require conf/distro/include/sane-srcdates.inc
13 14
14DISTRO_TYPE = "debug" 15DISTRO_TYPE = "debug"
15#DISTRO_TYPE = "release" 16#DISTRO_TYPE = "release"
@@ -17,13 +18,21 @@ DISTRO_TYPE = "debug"
17 18
18 19
19FEED_URIS += " \ 20FEED_URIS += " \
20 base##${ANGSTROM_URI}/unstable/feed/base/" 21 base##${ANGSTROM_URI}/unstable/feed/base \
22 perl##${ANGSTROM_URI}/unstable/feed/perl \
23 python##${ANGSTROM_URI}/unstable/feed/python \
24 debug##${ANGSTROM_URI}/unstable/feed/debug \
25 ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}"
21# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ 26# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
22# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ 27# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
23# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" 28# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
24 29
25SRCDATE = "20060518" 30#SRCDATE = "20060630"
26#SRCDATE_handhelds-pxa-2.6 = "20060516" 31#SRCDATE_handhelds-pxa-2.6 = "20060622"
32SRCDATE_gconf-dbus = "20060719"
33SRCDATE_gnome-vfs-dbus = "20060803"
34
35PREFERRED_VERSION_qemu-native = "0.8.2"
27 36
28CVS_TARBALL_STASH = "\ 37CVS_TARBALL_STASH = "\
29http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ 38http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
@@ -34,34 +43,63 @@ http://www.oesources.org/source/current/"
34PALMTOP_USE_MULTITHREADED_QT = "yes" 43PALMTOP_USE_MULTITHREADED_QT = "yes"
35QTE_VERSION = "2.3.10" 44QTE_VERSION = "2.3.10"
36OPIE_VERSION = "1.2.2" 45OPIE_VERSION = "1.2.2"
37include conf/distro/preferred-opie-versions.inc 46require conf/distro/include/preferred-opie-versions.inc
38 47
39# GPE 48# GPE
40include conf/distro/preferred-gpe-versions-2.8.inc 49require conf/distro/include/preferred-gpe-versions-2.8.inc
50
51PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
52
53PREFERRED_VERSION_fontconfig = "2.3.95"
54PREFERRED_VERSION_freetype = "2.2.1"
55
56#Small machines prefer kdrive, but we might ship full Xorg in other images
57PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
58PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
59
60require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
61
62PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
41 63
42#zap extra stuff taking place in $MACHINE.conf 64#zap extra stuff taking place in $MACHINE.conf
43GPE_EXTRA_INSTALL = "" 65GPE_EXTRA_INSTALL = ""
44 66
45# E
46include conf/distro/preferred-e-versions.inc
47
48PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
49PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
50PREFERRED_PROVIDER_libx11 = "diet-x11"
51 67
68# E
69require conf/distro/include/preferred-e-versions.inc
52 70
53#Make sure we use 2.6 on machines with a 2.4/2.6 selector 71#Make sure we use 2.6 on machines with a 2.4/2.6 selector
54KERNEL = "kernel26" 72KERNEL = "kernel26"
55ZKERNEL_VERSION = "2.6" 73MACHINE_KERNEL_VERSION = "2.6"
74
75PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
56 76
57PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" 77PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
58PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" 78PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
59PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" 79PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
60 80
61PREFERRED_PROVIDER_virtual/libiconv = "glibc" 81# Libc/uclibc:
62PREFERRED_PROVIDER_virtual/libintl = "glibc" 82#fix some iconv issues, needs to be adjusted when doing uclibc builds
83PREFERRED_PROVIDER_virtual/libiconv ?= glibc
84PREFERRED_PROVIDER_virtual/libintl ?= glibc
85
86# Virtuals:
87PREFERRED_PROVIDER_virtual/db ?= "db"
88PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
89PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
90
91# Others:
92PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
93PREFERRED_PROVIDER_gconf ?= gconf-dbus
94PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs
95PREFERRED_PROVIDER_tslib ?= tslib
96PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
97PREFERRED_PROVIDER_ntp = "ntp"
98PREFERRED_PROVIDER_hotplug = "udev"
99PREFERRED_PROVIDER_libxss = "libxss"
63 100
64#EABI stuff 101#EABI stuff
102PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
65PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" 103PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
66PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" 104PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
67 105
@@ -70,8 +108,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
70PREFERRED_VERSION_gcc ?= "4.1.1" 108PREFERRED_VERSION_gcc ?= "4.1.1"
71PREFERRED_VERSION_gcc-cross ?= "4.1.1" 109PREFERRED_VERSION_gcc-cross ?= "4.1.1"
72PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" 110PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
73PREFERRED_VERSION_binutils ?= "2.16.91.0.7" 111PREFERRED_VERSION_binutils ?= "2.17"
74PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" 112PREFERRED_VERSION_binutils-cross ?= "2.17"
75PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" 113PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
76PREFERRED_VERSION_glibc ?= "2.4" 114PREFERRED_VERSION_glibc ?= "2.4"
77PREFERRED_VERSION_glibc-intermediate ?= "2.4" 115PREFERRED_VERSION_glibc-intermediate ?= "2.4"
@@ -83,9 +121,12 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4"
83# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" 121# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
84 122
85 123
124# Busybox <1.1.0 doesn't have EABI support
125PREFERRED_VERSION_busybox = "1.2.1"
126
86PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" 127PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
87PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" 128PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
88PREFERRED_VERSION_dbus ?= "0.61" 129PREFERRED_VERSION_dbus ?= "0.92"
89PREFERRED_VERSION_gstreamer ?= "0.10.6" 130PREFERRED_VERSION_gstreamer ?= "0.10.6"
90 131
91PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" 132PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
@@ -101,18 +142,27 @@ PREFERRED_VERSION_hostap-modules ?= "0.4.7"
101PCMCIA_MANAGER_c7x0 = "pcmciautils" 142PCMCIA_MANAGER_c7x0 = "pcmciautils"
102PCMCIA_MANAGER_akita = "pcmciautils" 143PCMCIA_MANAGER_akita = "pcmciautils"
103PCMCIA_MANAGER_spitz = "pcmciautils" 144PCMCIA_MANAGER_spitz = "pcmciautils"
145PCMCIA_MANAGER_tosa = "pcmciautils"
146PCMCIA_MANAGER_poodle = "pcmciautils"
104PCMCIA_MANAGER_nokia770 = "pcmciautils" 147PCMCIA_MANAGER_nokia770 = "pcmciautils"
105PCMCIA_MANAGER_h2200 = "pcmciautils" 148PCMCIA_MANAGER_h2200 = "pcmciautils"
149PCMCIA_MANAGER_h4000 = "pcmciautils"
106PCMCIA_MANAGER_h6300 = "pcmciautils" 150PCMCIA_MANAGER_h6300 = "pcmciautils"
107PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" 151PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
108 152
153# add altboot to compatible models, will be replaced with angstrom-bootmanager
154#EXTRA_STUFF_append_c7x0 = "altboot"
155#EXTRA_STUFF_append_akita = "altboot"
156#EXTRA_STUFF_append_spitz = "altboot"
157#EXTRA_STUFF_append_poodle = "altboot"
158#EXTRA_STUFF_append_tosa = "altboot"
109 159
110 160### GPE section ###
111#### GPE section ###
112 161
113#Install libgtkinput in devices without a keyboard 162#Install libgtkinput in devices without a keyboard
114GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" 163GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
115GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" 164GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
165GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput"
116GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" 166GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput"
117GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" 167GPE_EXTRA_INSTALL_append_simpad = " libgtkinput"
118GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" 168GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
diff --git a/meta/conf/distro/familiar-unstable.conf b/meta/conf/distro/familiar-unstable.conf
index e42456672c..6ae4e9ddc3 100644
--- a/meta/conf/distro/familiar-unstable.conf
+++ b/meta/conf/distro/familiar-unstable.conf
@@ -1,15 +1,13 @@
1DISTRO = "familiar" 1DISTRO = "familiar"
2DISTRO_NAME = "Familiar Linux" 2DISTRO_NAME = "Familiar Linux"
3DISTRO_VERSION = "unstable-${DATE}" 3DISTRO_VERSION = "unstable-${DATE}"
4# Do not touch this file before notifying familiar-dev@handhelds.org
5 4
6include conf/distro/familiar.conf 5require conf/distro/include/familiar.inc
7 6
8DISTRO_TYPE = "debug" 7DISTRO_TYPE = "debug"
9#DISTRO_TYPE = "release" 8#DISTRO_TYPE = "release"
10#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! 9#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
11 10
12
13FEED_URIS += " \ 11FEED_URIS += " \
14 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ 12 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
15 ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \ 13 ${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \
@@ -25,8 +23,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
25PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" 23PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
26PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" 24PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
27 25
28PREFERRED_PROVIDER_virtual/libiconv=glibc 26PREFERRED_PROVIDER_virtual/libiconv = "glibc"
29PREFERRED_PROVIDER_virtual/libintl=glibc 27PREFERRED_PROVIDER_virtual/libintl = "glibc"
30 28
31PREFERRED_VERSION_hostap-modules ?= "0.3.9" 29PREFERRED_VERSION_hostap-modules ?= "0.3.9"
32 30
@@ -37,7 +35,6 @@ PREFERRED_VERSION_orinoco-modules ?= "0.13e"
37PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15" 35PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
38PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" 36PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
39 37
40
41# The CSL compiler is unusable because 38# The CSL compiler is unusable because
42# 1) certain programs stop to compile 39# 1) certain programs stop to compile
43# 2) more programs segfault 40# 2) more programs segfault
@@ -51,6 +48,14 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
51PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" 48PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
52PREFERRED_VERSION_binutils ?= "2.15.94.0.1" 49PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
53 50
51
52#
53# Base
54#
55PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
56PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
57require conf/distro/include/sane-srcdates.inc
58
54# 59#
55# Opie 60# Opie
56# 61#
@@ -58,7 +63,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
58OPIE_VERSION = "1.2.2" 63OPIE_VERSION = "1.2.2"
59QTE_VERSION = "2.3.10" 64QTE_VERSION = "2.3.10"
60PALMTOP_USE_MULTITHREADED_QT = "yes" 65PALMTOP_USE_MULTITHREADED_QT = "yes"
61include conf/distro/preferred-opie-versions.inc 66require conf/distro/include/preferred-opie-versions.inc
62 67
63# 68#
64# GPE 69# GPE
@@ -66,12 +71,11 @@ include conf/distro/preferred-opie-versions.inc
66 71
67PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" 72PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
68PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" 73PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
69PREFERRED_PROVIDER_libx11 = "diet-x11" 74PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
70 75require conf/distro/include/preferred-gpe-versions-2.8.inc
71include conf/distro/preferred-gpe-versions-2.8.inc
72 76
73# 77#
74# E 78# E
75# 79#
76include conf/distro/preferred-e-versions.inc 80require conf/distro/include/preferred-e-versions.inc
77 81
diff --git a/meta/conf/distro/angstrom.conf b/meta/conf/distro/include/angstrom.inc
index 100017410d..7e765bd925 100644
--- a/meta/conf/distro/angstrom.conf
+++ b/meta/conf/distro/include/angstrom.inc
@@ -6,35 +6,38 @@ DISTRO = "angstrom"
6DISTRO_NAME = "Angstrom" 6DISTRO_NAME = "Angstrom"
7 7
8#Use this variable in feeds and other parts that need a URI 8#Use this variable in feeds and other parts that need a URI
9ANGSTROM_URI = "http://www.angstrom-distribution.org/" 9ANGSTROM_URI = "http://www.angstrom-distribution.org"
10 10
11#Set the default maintainer to angstrom-dev 11#Set the default maintainer to angstrom-dev
12MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>" 12MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>"
13 13
14#use ipkg package format with debian style naming 14#use ipkg package format with debian style naming
15#use multimachine buildrules 15#use multimachine buildrules
16INHERIT += "package_ipk debian multimachine" 16INHERIT += "package_ipk debian multimachine"
17 17
18#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable 18#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
19PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native" 19PREFERRED_PROVIDER_qemu-native = "qemu-native"
20ENABLE_BINARY_LOCALE_GENERATION ?= "" 20ENABLE_BINARY_LOCALE_GENERATION ?= "1"
21 21
22 22
23#Use the ARM EABI when building for an ARM cpu. We can't use overrides 23#Use the ARM EABI when building for an ARM cpu. We can't use overrides
24#here because this breaks all places where ":=" is used. 24#here because this breaks all places where ":=" is used.
25TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" 25#if you want to build using uclibc, specify "-uclibcgnueabi"
26TARGET_VENDOR = "-angstrom"
26TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" 27TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
28#uclibc (needs gcc 4.1.1 or newer)
29#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
27 30
28#mess with compiler flags to use -Os instead of -O2 31#mess with compiler flags to use -Os instead of -O2
29#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info 32#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
30FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" 33FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
31BUILD_OPTIMIZATION = "-Os" 34BUILD_OPTIMIZATION = "-Os"
35CXXFLAGS += "-fvisibility-inlines-hidden"
32 36
33#ARM EABI is softfloat by default, but let's make sure :) 37#ARM EABI is softfloat by default, but let's make sure :)
34TARGET_FPU_arm = "soft" 38TARGET_FPU_arm = "soft"
35 39
36#Always ship these packages 40#Always ship these packages
37BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
38BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit" 41BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
39 42
40#Name the generated images in a sane way 43#Name the generated images in a sane way
diff --git a/meta/conf/distro/familiar.conf b/meta/conf/distro/include/familar.inc
index 2646fe78a6..2646fe78a6 100644
--- a/meta/conf/distro/familiar.conf
+++ b/meta/conf/distro/include/familar.inc
diff --git a/meta/conf/distro/maemo-preferred.inc b/meta/conf/distro/include/maemo-preferred.inc
index 943f244326..943f244326 100644
--- a/meta/conf/distro/maemo-preferred.inc
+++ b/meta/conf/distro/include/maemo-preferred.inc
diff --git a/meta/conf/distro/openzaurus.conf b/meta/conf/distro/include/openzaurus.inc
index b7f456320f..264cceecfd 100644
--- a/meta/conf/distro/openzaurus.conf
+++ b/meta/conf/distro/include/openzaurus.inc
@@ -16,3 +16,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
16PARALLEL_INSTALL_MODULES = "1" 16PARALLEL_INSTALL_MODULES = "1"
17 17
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')}" 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
20# Set minimal version of BitBake needed
21BB_MIN_VERSION = "1.4.4"
22INHERIT += "sanity"
diff --git a/meta/conf/distro/poky-eabi.conf b/meta/conf/distro/include/poky-eabi.inc
index d35ec8e441..d35ec8e441 100644
--- a/meta/conf/distro/poky-eabi.conf
+++ b/meta/conf/distro/include/poky-eabi.inc
diff --git a/meta/conf/distro/poky-eabi2.conf b/meta/conf/distro/include/poky-eabi2.inc
index 2833f3090e..2833f3090e 100644
--- a/meta/conf/distro/poky-eabi2.conf
+++ b/meta/conf/distro/include/poky-eabi2.inc
diff --git a/meta/conf/distro/poky-oabi.conf b/meta/conf/distro/include/poky-oabi.inc
index 71d6092011..71d6092011 100644
--- a/meta/conf/distro/poky-oabi.conf
+++ b/meta/conf/distro/include/poky-oabi.inc
diff --git a/meta/conf/distro/preferred-e-versions.inc b/meta/conf/distro/include/preferred-e-versions.inc
index 607acad858..607acad858 100644
--- a/meta/conf/distro/preferred-e-versions.inc
+++ b/meta/conf/distro/include/preferred-e-versions.inc
diff --git a/meta/conf/distro/preferred-gpe-versions-2.7.inc b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc
index 933195977d..36702025c1 100644
--- a/meta/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -21,6 +21,7 @@ PREFERRED_VERSION_atk ?= "1.9.0"
21PREFERRED_VERSION_cairo ?= "0.5.2" 21PREFERRED_VERSION_cairo ?= "0.5.2"
22PREFERRED_VERSION_glib-2.0 ?= "2.6.4" 22PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
23PREFERRED_VERSION_gtk+ ?= "2.6.10" 23PREFERRED_VERSION_gtk+ ?= "2.6.10"
24PREFERRED_VERSION_gtk-engines ?= "2.6.5"
24PREFERRED_VERSION_pango ?= "1.8.1" 25PREFERRED_VERSION_pango ?= "1.8.1"
25PREFERRED_VERSION_librsvg ?= "2.6.5" 26PREFERRED_VERSION_librsvg ?= "2.6.5"
26PREFERRED_VERSION_libgpewidget ?= "0.109" 27PREFERRED_VERSION_libgpewidget ?= "0.109"
@@ -37,6 +38,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
37PREFERRED_VERSION_rxvt-unicode ?= "5.6" 38PREFERRED_VERSION_rxvt-unicode ?= "5.6"
38PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" 39PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
39PREFERRED_VERSION_xst ?= "0.15" 40PREFERRED_VERSION_xst ?= "0.15"
41PREFERRED_PROVIDER_xextensions = "xextensions"
40PREFERRED_VERSION_xextensions ?= "1.0.1" 42PREFERRED_VERSION_xextensions ?= "1.0.1"
41PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" 43PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
42PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 44PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
diff --git a/meta/conf/distro/preferred-opie-versions.inc b/meta/conf/distro/include/preferred-opie-versions.inc
index 51c9937628..34c1fd498e 100644
--- a/meta/conf/distro/preferred-opie-versions.inc
+++ b/meta/conf/distro/include/preferred-opie-versions.inc
@@ -65,6 +65,7 @@ PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
65PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}" 65PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
66PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}" 66PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
67PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}" 67PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
68PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
68PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}" 69PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
69PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}" 70PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
70PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}" 71PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
@@ -203,4 +204,6 @@ PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
203PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" 204PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
204PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" 205PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
205PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" 206PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
207PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
208PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
206PREFERRED_VERSION_konqueror-embedded = "20060404" 209PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/meta/conf/distro/include/sane-srcdates.inc b/meta/conf/distro/include/sane-srcdates.inc
new file mode 100644
index 0000000000..0696ad1909
--- /dev/null
+++ b/meta/conf/distro/include/sane-srcdates.inc
@@ -0,0 +1,85 @@
1# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version
2
3# Kernel modules
4SRCDATE_at76c503a-modules ?= "20060814"
5SRCDATE_prism54-module ?= "20060814"
6
7# X11 libs, extentions and protos
8SRCDATE_xcalibrate ?= "20060804"
9SRCDATE_compositeext ?= "20060814"
10SRCDATE_drm ?= "20060814"
11SRCDATE_drm-kernel ?= "20060814"
12SRCDATE_fixesext ?= "20060814"
13SRCDATE_libxext-native ?= "20060814"
14SRCDATE_libxss ?= "20060814"
15SRCDATE_recordext ?= "20060814"
16SRCDATE_renderext ?= "20060814"
17SRCDATE_xcalibrate ?= "20060814"
18SRCDATE_xcalibrateext ?= "20060814"
19SRCDATE_xxf86dgaext ?= "20060814"
20SRCDATE_xxf86vmext ?= "20060814"
21
22# Matchbox / O-hand
23SRCDATE_contacts ?= "20060707"
24SRCDATE_dates ?= "20060707"
25SRCDATE_web ?= "20060613"
26SRCDATE_eds-dbus ?= "20060707"
27SRCDATE_matchbox-common ?= "20060612"
28SRCDATE_matchbox-config-gtk ?= "20060612"
29SRCDATE_matchbox-desktop ?= "20060612"
30SRCDATE_matchbox-keyboard ?= "20060612"
31SRCDATE_matchbox-panel ?= "20060612"
32SRCDATE_matchbox-panel-manager ?= "20060612"
33SRCDATE_matchbox-stroke ?= "20060612"
34SRCDATE_matchbox-themes-extra ?= "20060612"
35SRCDATE_matchbox-wm ?= "20060612"
36SRCDATE_libmatchbox ?= "20060612"
37SRCDATE_libfakekey ?= "20051101"
38SRCDATE_zaurusd ?= "20060628"
39
40# GPE
41SRCDATE_dasher-gpe ?= "20060814"
42SRCDATE_rosetta ?= "20060804"
43
44# GNOME
45SRCDATE_gconf-dbus ?= "20060719"
46SRCDATE_gnome-vfs-dbus ?= "20060119"
47SRCDATE_gtkhtml2 ?= "20060323"
48
49#Misc apps, sorted by alphabet
50SRCDATE_avetanabt ?= "20060814"
51SRCDATE_bl ?= "20060814"
52SRCDATE_dvbstream ?= "20060814"
53SRCDATE_dvbtraffic ?= "20060814"
54SRCDATE_dvbtune ?= "20060814"
55SRCDATE_fdclock ?= "20060814"
56SRCDATE_fltk ?= "20060814"
57SRCDATE_ipkg-link ?= "20050930"
58SRCDATE_ipkg-link-1 ?= "20050930"
59SRCDATE_ipkg-utils ?= "20050930"
60SRCDATE_ipkg-utils-native ?= "20050930"
61SRCDATE_kaffe-qt ?= "20060814"
62SRCDATE_kbdd ?= "20060814"
63SRCDATE_led ?= "20060814"
64SRCDATE_linux-input ?= "20060814"
65SRCDATE_madwifi-modules ?= "20060814"
66SRCDATE_mileage ?= "20060814"
67SRCDATE_minimo ?= "20050401"
68SRCDATE_mystun-server ?= "20060814"
69SRCDATE_olsrd ?= "20060814"
70SRCDATE_opencvs ?= "20060814"
71SRCDATE_oprofile ?= "20060214"
72SRCDATE_portaudio ?= "20060814"
73SRCDATE_putty ?= "20060814"
74SRCDATE_python-cairo ?= "20060814"
75SRCDATE_qemu-native ?= "20060723"
76SRCDATE_roadster ?= "20060814"
77SRCDATE_sctzap ?= "20060814"
78SRCDATE_tslib ?= "20051101"
79SRCDATE_waimea ?= "20060814"
80SRCDATE_xcompmgr ?= "20060814"
81SRCDATE_xirssi ?= "20060814"
82SRCDATE_xsvg ?= "20060814"
83SRCDATE_yamonenv ?= "20060814"
84SRCDATE_zroadmap ?= "20060814"
85
diff --git a/meta/conf/distro/maemo-1.0.conf b/meta/conf/distro/maemo-1.0.conf
index d30ecc9084..b8592fdf68 100644
--- a/meta/conf/distro/maemo-1.0.conf
+++ b/meta/conf/distro/maemo-1.0.conf
@@ -1,4 +1,4 @@
1include conf/distro/familiar.conf 1require conf/distro/include/familiar.inc
2 2
3DISTRO = "maemo" 3DISTRO = "maemo"
4DISTRO_NAME = "Maemo Linux" 4DISTRO_NAME = "Maemo Linux"
@@ -8,9 +8,7 @@ DISTRO_TYPE = "debug"
8#DISTRO_TYPE = "release" 8#DISTRO_TYPE = "release"
9 9
10FEED_URIS += " \ 10FEED_URIS += " \
11 base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ 11 "
12 updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
13
14#SRCDATE = 20050331 12#SRCDATE = 20050331
15 13
16PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" 14PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -29,12 +27,12 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
29 27
30PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" 28PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
31PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" 29PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
32PREFERRED_PROVIDER_libx11 = "diet-x11" 30PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
33 31
34include conf/distro/preferred-gpe-versions.inc 32require conf/distro/include/preferred-gpe-versions.inc
35 33
36# 34#
37# Maemo 35# Maemo
38# 36#
39 37
40include conf/distro/maemo-preferred.inc 38require conf/distro/include/maemo-preferred.inc
diff --git a/meta/conf/distro/openzaurus-unstable.conf b/meta/conf/distro/openzaurus-unstable.conf
index 9f79c32118..43492944ff 100644
--- a/meta/conf/distro/openzaurus-unstable.conf
+++ b/meta/conf/distro/openzaurus-unstable.conf
@@ -11,7 +11,8 @@ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/s
11http://www.oesources.org/source/current/" 11http://www.oesources.org/source/current/"
12 12
13 13
14include conf/distro/openzaurus.conf 14require conf/distro/include/sane-srcdates.inc
15require conf/distro/include/openzaurus.inc
15 16
16DISTRO_TYPE = "debug" 17DISTRO_TYPE = "debug"
17# DISTRO_TYPE = "release" 18# DISTRO_TYPE = "release"
@@ -25,20 +26,22 @@ DISTRO_TYPE = "debug"
25# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ 26# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
26# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" 27# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
27 28
28SRCDATE = "20060514" 29SRCDATE ?= "20060701"
30
29# 31#
30# Zaurus 32# Zaurus
31# 33#
32
33ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" 34ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
34PREFERRED_PROVIDER_hostap-conf = "hostap-conf" 35PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
36PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
37PREFERRED_PROVIDER_tslib ?= tslib
35 38
36KERNEL_CONSOLE = "ttyS0" 39KERNEL_CONSOLE = "ttyS0"
37#DEBUG_OPTIMIZATION = "-O -g3" 40#DEBUG_OPTIMIZATION = "-O -g3"
38#DEBUG_BUILD = "1" 41#DEBUG_BUILD = "1"
39#INHIBIT_PACKAGE_STRIP = "1" 42#INHIBIT_PACKAGE_STRIP = "1"
40 43
41# fix some iconv issues, needs to be adjusted when doing uclibc builds 44# Glibc provides iconv and intl -- adjust, when doing uclibc builds
42PREFERRED_PROVIDER_virtual/libiconv = "glibc" 45PREFERRED_PROVIDER_virtual/libiconv = "glibc"
43PREFERRED_PROVIDER_virtual/libintl = "glibc" 46PREFERRED_PROVIDER_virtual/libintl = "glibc"
44 47
@@ -49,23 +52,26 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
49PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" 52PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
50PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" 53PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
51 54
55PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
56PREFERRED_VERSION_binutils = "2.15.94.0.1"
57
52# 58#
53# Opie 59# Opie
54# 60#
55#QTE_VERSION = "2.3.10" 61QTE_VERSION = "2.3.10"
56#OPIE_VERSION = "1.2.2" 62OPIE_VERSION = "1.2.2"
57#PALMTOP_USE_MULTITHREADED_QT = "yes" 63PALMTOP_USE_MULTITHREADED_QT = "yes"
58include conf/distro/preferred-opie-versions.inc 64require conf/distro/include/preferred-opie-versions.inc
59 65
60# 66#
61# GPE 67# GPE
62# 68#
63PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" 69PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
64PREFERRED_PROVIDER_libx11 = "diet-x11" 70PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
65include conf/distro/preferred-gpe-versions-2.8.inc 71require conf/distro/include/preferred-gpe-versions-2.8.inc
66 72
67# 73#
68# E 74# E
69# 75#
70include conf/distro/preferred-e-versions.inc 76require conf/distro/include/preferred-e-versions.inc
71 77
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index f461c5619d..c326314710 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -37,7 +37,7 @@ KERNEL_CONSOLE = "ttyS0"
37 37
38POKYMODE ?= "oabi" 38POKYMODE ?= "oabi"
39 39
40include conf/distro/poky-${POKYMODE}.conf 40require conf/distro/include/poky-${POKYMODE}.inc
41 41
42# 42#
43# Preferred providers: 43# Preferred providers:
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 17:25:26 +0000