summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-20 17:13:43 (GMT)
committerRichard Purdie <richard@openedhand.com>2006-11-20 17:13:43 (GMT)
commit4398b980ba11f6a76f6c863f67f174cf1dc2bef6 (patch)
treeef35bc5c6f898f654d942f972146b3b2161f3f30 /meta
parent173b999d9585d61890bdabc4d26a784bc7758ec4 (diff)
downloadpoky-4398b980ba11f6a76f6c863f67f174cf1dc2bef6.tar.gz
conf: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@892 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf11
-rw-r--r--meta/conf/distro/angstrom-2007.1.conf171
-rw-r--r--meta/conf/distro/include/angstrom.inc42
-rw-r--r--meta/conf/distro/include/maemo-preferred.inc10
-rw-r--r--meta/conf/distro/include/openzaurus.inc2
-rw-r--r--meta/conf/distro/include/preferred-gpe-versions-2.7.inc6
-rw-r--r--meta/conf/distro/include/preferred-opie-versions.inc2
-rw-r--r--meta/conf/distro/include/sane-srcdates.inc15
-rw-r--r--meta/conf/distro/openzaurus-unstable.conf14
-rw-r--r--meta/conf/distro/poky.conf13
-rw-r--r--meta/conf/documentation.conf4
-rw-r--r--meta/conf/machine/akita.conf2
-rw-r--r--meta/conf/machine/c7x0.conf2
-rw-r--r--meta/conf/machine/include/ixp4xx.conf20
-rw-r--r--meta/conf/machine/include/poodle-2.6.conf2
-rw-r--r--meta/conf/machine/include/qemu.conf1
-rw-r--r--meta/conf/machine/include/tosa-2.6.conf2
-rw-r--r--meta/conf/machine/include/tune-arm920t.conf2
-rw-r--r--meta/conf/machine/include/tune-arm9tdmi.conf1
-rw-r--r--meta/conf/machine/include/tune-iwmmxt.conf2
-rw-r--r--meta/conf/machine/include/zaurus-2.6.conf (renamed from meta/conf/machine/include/zaurus-clamshell-2.6.conf)10
-rw-r--r--meta/conf/machine/nokia770.conf4
-rw-r--r--meta/conf/machine/spitz.conf2
-rw-r--r--meta/conf/sanity.conf2
24 files changed, 187 insertions, 155 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2af2abe..d639e27 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -125,9 +125,9 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
125 /lib/*.a /lib/*.o ${datadir}/aclocal" 125 /lib/*.a /lib/*.o ${datadir}/aclocal"
126# RRECOMMENDS_${PN}-dbg = "${PN} (>= ${PV})" 126# RRECOMMENDS_${PN}-dbg = "${PN} (>= ${PV})"
127RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" 127RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
128FILES_${PN}-locale = "${datadir}/locale"
128FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ 129FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
129 /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" 130 /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug"
130FILES_${PN}-locale = "${datadir}/locale"
131 131
132# File manifest 132# File manifest
133 133
@@ -161,6 +161,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
161STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" 161STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
162STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" 162STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
163STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" 163STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
164STAGING_FIRMWARE_DIR = "${STAGING_DIR}/${HOST_SYS}/firmware"
164STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 165STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
165 166
166DEPLOY_DIR = "${TMPDIR}/deploy" 167DEPLOY_DIR = "${TMPDIR}/deploy"
@@ -193,12 +194,14 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r
193IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" 194IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
194IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" 195IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
195IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" 196IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
197IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
196IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." 198IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
197IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." 199IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
198IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." 200IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
199EXTRA_IMAGECMD = "" 201EXTRA_IMAGECMD = ""
200EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" 202EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
201EXTRA_IMAGECMD_squashfs = "-le -b 16384" 203EXTRA_IMAGECMD_squashfs = "-le -b 16384"
204EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384"
202 205
203IMAGE_DEPENDS = "" 206IMAGE_DEPENDS = ""
204IMAGE_DEPENDS_jffs2 = "mtd-utils-native" 207IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
@@ -206,6 +209,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native"
206IMAGE_DEPENDS_ext2 = "genext2fs-native" 209IMAGE_DEPENDS_ext2 = "genext2fs-native"
207IMAGE_DEPENDS_ext2.gz = "genext2fs-native" 210IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
208IMAGE_DEPENDS_squashfs = "squashfs-tools-native" 211IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
212IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native"
209EXTRA_IMAGEDEPENDS = "" 213EXTRA_IMAGEDEPENDS = ""
210 214
211################################################################## 215##################################################################
@@ -316,7 +320,8 @@ export palmqtdir = "/opt/QtPalmtop"
316GNU_MIRROR = "ftp://ftp.gnu.org/gnu" 320GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
317DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" 321DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
318SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" 322SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
319GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" 323GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
324GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
320XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" 325XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
321XORG_MIRROR = "http://xorg.freedesktop.org/releases" 326XORG_MIRROR = "http://xorg.freedesktop.org/releases"
322GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" 327GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
@@ -357,7 +362,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}"
357# a RCS, which freaks out those special folks with active Perforce clients 362# a RCS, which freaks out those special folks with active Perforce clients
358# the following makes patch ignore RCS: 363# the following makes patch ignore RCS:
359 364
360export PATCH_GET=0 365export PATCH_GET="0"
361 366
362# Program to be used to build ipkg packages 367# Program to be used to build ipkg packages
363 368
diff --git a/meta/conf/distro/angstrom-2007.1.conf b/meta/conf/distro/angstrom-2007.1.conf
index 327d412..f593194 100644
--- a/meta/conf/distro/angstrom-2007.1.conf
+++ b/meta/conf/distro/angstrom-2007.1.conf
@@ -6,52 +6,87 @@
6#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> 6#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
7#@-------------------------------------------------------------------- 7#@--------------------------------------------------------------------
8 8
9#DISTRO_VERSION = "2006.9" 9#DISTRO_VERSION = "2007.1"
10DISTRO_VERSION = "test-${DATE}" 10DISTRO_VERSION = "test-${DATE}"
11DISTRO_REVISION = "10"
11 12
12require conf/distro/include/angstrom.inc 13require conf/distro/include/angstrom.inc
13require conf/distro/include/sane-srcdates.inc 14require conf/distro/include/sane-srcdates.inc
14 15
15DISTRO_TYPE = "debug" 16DISTRO_TYPE = "debug"
16#DISTRO_TYPE = "release" 17#DISTRO_TYPE = "release"
17#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
18 18
19#Set the right arch for the feeds
20#Alphabetically sorted
21
22FEED_ARCH ?= "${TARGET_ARCH}"
23
24#armv4t machines
25
26FEED_ARCH_ep93xx = "armv4t"
27FEED_ARCH_h6300 = "armv4t"
28
29#armv5t machines
30
31FEED_ARCH_a780 = "armv5te"
32FEED_ARCH_akita = "armv5te"
33FEED_ARCH_c7x0 = "armv5te"
34FEED_ARCH_h2200 = "armv5te"
35FEED_ARCH_h4000 = "armv5te"
36FEED_ARCH_h5xxx = "armv5te"
37FEED_ARCH_htcuniversal = "armv5te"
38FEED_ARCH_hx2000 = "armv5te"
39FEED_ARCH_hx4700 = "armv5te"
40FEED_ARCH_ixp4xx = "armv5te"
41FEED_ARCH_magician = "armv5te"
42FEED_ARCH_netbook-pro = "armv5te"
43FEED_ARCH_nokia770 = "armv5te"
44FEED_ARCH_poodle = "armv5te"
45FEED_ARCH_spitz = "armv5te"
46FEED_ARCH_tosa = "armv5te"
47
48#i686 machines
49
50FEED_ARCH_guinness = "i686"
19 51
20FEED_URIS += " \ 52FEED_URIS += " \
21 base##${ANGSTROM_URI}/unstable/feed/base \ 53 no-arch##${ANGSTROM_URI}/unstable/feed/all \
22 perl##${ANGSTROM_URI}/unstable/feed/perl \ 54 base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
23 python##${ANGSTROM_URI}/unstable/feed/python \ 55 perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
24 debug##${ANGSTROM_URI}/unstable/feed/debug \ 56 python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
25 ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}" 57 debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
26# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ 58 ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
27# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ 59# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
28# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" 60# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
29 61# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
30#SRCDATE = "20060630" 62
31#SRCDATE_handhelds-pxa-2.6 = "20060622" 63
64# We will lock down a SRCDATE when we go into release mode
65#SRCDATE = "20061029"
66
67PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7"
68PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh2"
69
70
32SRCDATE_gconf-dbus = "20060719" 71SRCDATE_gconf-dbus = "20060719"
33SRCDATE_gnome-vfs-dbus = "20060803" 72SRCDATE_gnome-vfs-dbus = "20060803"
34 73
35PREFERRED_VERSION_qemu-native = "0.8.2"
36
37CVS_TARBALL_STASH = "\ 74CVS_TARBALL_STASH = "\
38http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ 75http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
39http://www.oesources.org/source/current/" 76"
40
41# Opie
42#use 1337 mt version of opie to have a webbrowser
43PALMTOP_USE_MULTITHREADED_QT = "yes"
44QTE_VERSION = "2.3.10"
45OPIE_VERSION = "1.2.2"
46require conf/distro/include/preferred-opie-versions.inc
47 77
48# GPE 78# GPE
49require conf/distro/include/preferred-gpe-versions-2.8.inc 79require conf/distro/include/preferred-gpe-versions-2.8.inc
50 80
51PREFERRED_PROVIDER_dbus-glib = "dbus-glib" 81PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
82PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
83PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
84
52 85
53PREFERRED_VERSION_fontconfig = "2.3.95" 86PREFERRED_VERSION_fontconfig = "2.3.95"
54PREFERRED_VERSION_freetype = "2.2.1" 87PREFERRED_VERSION_freetype = "2.2.1"
88#fix screen corruption issues
89PREFERRED_VERSION_cairo = "1.3.2"
55 90
56#Small machines prefer kdrive, but we might ship full Xorg in other images 91#Small machines prefer kdrive, but we might ship full Xorg in other images
57PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" 92PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -59,7 +94,8 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
59 94
60require conf/distro/include/preferred-xorg-versions-X11R7.1.inc 95require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
61 96
62PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" 97PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
98PREFERRED_VERSION_gtk+ = "2.10.6"
63 99
64#zap extra stuff taking place in $MACHINE.conf 100#zap extra stuff taking place in $MACHINE.conf
65GPE_EXTRA_INSTALL = "" 101GPE_EXTRA_INSTALL = ""
@@ -78,41 +114,49 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
78PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" 114PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
79PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" 115PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
80 116
81# Libc/uclibc:
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: 117# Virtuals:
87PREFERRED_PROVIDER_virtual/db ?= "db" 118PREFERRED_PROVIDER_virtual/db ?= "db"
88PREFERRED_PROVIDER_virtual/db-native ?= "db-native" 119PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
89PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive 120PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
90 121
91# Others: 122# Others:
92PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" 123PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
93PREFERRED_PROVIDER_gconf ?= gconf-dbus 124PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
94PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs 125PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
95PREFERRED_PROVIDER_tslib ?= tslib 126PREFERRED_PROVIDER_tslib ?= "tslib"
127PREFERRED_PROVIDER_tslib-conf ?= "tslib"
96PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" 128PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
97PREFERRED_PROVIDER_ntp = "ntp" 129PREFERRED_PROVIDER_ntp = "ntp"
98PREFERRED_PROVIDER_hotplug = "udev" 130PREFERRED_PROVIDER_hotplug = "udev"
99PREFERRED_PROVIDER_libxss = "libxss" 131PREFERRED_PROVIDER_libxss = "libxss"
100 132
133#Machine related toolchain stuff
134ARCH_BYTE_SEX_ixp4xx = "le"
135
136
101#EABI stuff 137#EABI stuff
102PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" 138PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
103PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" 139PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
104PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" 140PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
105 141
142#shouldn't that be uclibc-initial????
143PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
106 144
107#use EABI toolchain 145#use EABI toolchain
108PREFERRED_VERSION_gcc ?= "4.1.1" 146PREFERRED_VERSION_gcc ?= "4.1.1"
109PREFERRED_VERSION_gcc-cross ?= "4.1.1" 147PREFERRED_VERSION_gcc-cross ?= "4.1.1"
148PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1"
110PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" 149PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
111PREFERRED_VERSION_binutils ?= "2.17" 150
112PREFERRED_VERSION_binutils-cross ?= "2.17" 151PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
152PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
153PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
154
155PREFERRED_VERSION_linux-libc-headers_guinness ?= "2.6.18"
113PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" 156PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
114PREFERRED_VERSION_glibc ?= "2.4" 157
115PREFERRED_VERSION_glibc-intermediate ?= "2.4" 158PREFERRED_VERSION_glibc ?= "2.5"
159PREFERRED_VERSION_glibc-intermediate ?= "2.5"
116 160
117# To use an EABI compatible version 3 series gcc, either uncomment 161# To use an EABI compatible version 3 series gcc, either uncomment
118# the lines below or set them in local.conf: 162# the lines below or set them in local.conf:
@@ -126,29 +170,21 @@ PREFERRED_VERSION_busybox = "1.2.1"
126 170
127PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" 171PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
128PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" 172PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
129PREFERRED_VERSION_dbus ?= "0.92" 173
174PREFERRED_VERSION_dbus ?= "1.0.1"
175PREFERRED_VERSION_dbus-glib ?= "0.71"
176
130PREFERRED_VERSION_gstreamer ?= "0.10.6" 177PREFERRED_VERSION_gstreamer ?= "0.10.6"
131 178
132PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" 179PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
133PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" 180PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
134PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" 181PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
135PREFERRED_VERSION_hostap-modules ?= "0.4.7" 182PREFERRED_VERSION_hostap-modules ?= "0.4.7"
183PREFERRED_VERSION_hostap-utils ?= "0.4.7"
136 184
137#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff 185#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
138# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad 186# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
139 187
140#### Bootstrap options ####
141
142PCMCIA_MANAGER_c7x0 = "pcmciautils"
143PCMCIA_MANAGER_akita = "pcmciautils"
144PCMCIA_MANAGER_spitz = "pcmciautils"
145PCMCIA_MANAGER_tosa = "pcmciautils"
146PCMCIA_MANAGER_poodle = "pcmciautils"
147PCMCIA_MANAGER_nokia770 = "pcmciautils"
148PCMCIA_MANAGER_h2200 = "pcmciautils"
149PCMCIA_MANAGER_h4000 = "pcmciautils"
150PCMCIA_MANAGER_h6300 = "pcmciautils"
151PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
152 188
153# add altboot to compatible models, will be replaced with angstrom-bootmanager 189# add altboot to compatible models, will be replaced with angstrom-bootmanager
154#EXTRA_STUFF_append_c7x0 = "altboot" 190#EXTRA_STUFF_append_c7x0 = "altboot"
@@ -157,20 +193,27 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
157#EXTRA_STUFF_append_poodle = "altboot" 193#EXTRA_STUFF_append_poodle = "altboot"
158#EXTRA_STUFF_append_tosa = "altboot" 194#EXTRA_STUFF_append_tosa = "altboot"
159 195
160### GPE section ###
161 196
162#Install libgtkinput in devices without a keyboard 197# do some task-base stuff here
163GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" 198
164GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" 199# We want to ship extra debug utils in the rootfs when doing a debug build
165GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" 200DEBUG_APPS ?= ""
166GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" 201DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
167GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" 202
168GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" 203#this should go away soon
204EXTRA_STUFF ?= ""
169 205
170#As soon as a kill switch is in place we can add it to devices with a keyboard
171#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput"
172#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput"
173#GPE_EXTRA_INSTALL_append_akita = " libgtkinput"
174#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput"
175 206
207# Angstrom want to ship some extra stuff. This should be moved into task-base eventually
208DISTRO_EXTRA_RDEPENDS = "\
209 update-modules module-init-tools modutils-initscripts \
210 sysvinit initscripts sysvinit-pidof \
211 psplash \
212 netbase dropbear \
213 angstrom-version \
214 ipkg ipkg-collateral \
215 util-linux-mount util-linux-umount \
216 ${EXTRA_STUFF} \
217 ${DEBUG_APPS} \
218 "
176 219
diff --git a/meta/conf/distro/include/angstrom.inc b/meta/conf/distro/include/angstrom.inc
index 5ff9e1c..3bf87ab 100644
--- a/meta/conf/distro/include/angstrom.inc
+++ b/meta/conf/distro/include/angstrom.inc
@@ -5,47 +5,47 @@
5DISTRO = "angstrom" 5DISTRO = "angstrom"
6DISTRO_NAME = "Angstrom" 6DISTRO_NAME = "Angstrom"
7 7
8TARGET_VENDOR = "-angstrom"
9MACHINE_TASK_PROVIDER = "task-base"
10
11# Can be "glibc" and "uclibc"
12ANGSTROM_MODE ?= "glibc"
13
14DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
15require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
16
8#Use this variable in feeds and other parts that need a URI 17#Use this variable in feeds and other parts that need a URI
9ANGSTROM_URI = "http://www.angstrom-distribution.org" 18ANGSTROM_URI = "http://www.angstrom-distribution.org"
10 19
11#Set the default maintainer to angstrom-dev 20#Set the default maintainer to angstrom-dev
12MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>" 21MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
13 22
14#use ipkg package format with debian style naming 23#use ipkg package format with debian style naming
15#use multimachine buildrules 24#use multimachine buildrules
16INHERIT += "package_ipk debian multimachine" 25INHERIT += "package_ipk debian multimachine sanity"
17 26
18#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable 27#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
19PREFERRED_PROVIDER_qemu-native = "qemu-native" 28PREFERRED_PROVIDER_qemu-native = "qemu-native"
20ENABLE_BINARY_LOCALE_GENERATION ?= "1" 29ENABLE_BINARY_LOCALE_GENERATION ?= "1"
21 30
22 31#qemu doesn't like armv6/eabi/vfp
23#Use the ARM EABI when building for an ARM cpu. We can't use overrides 32ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0"
24#here because this breaks all places where ":=" is used.
25#if you want to build using uclibc, specify "-uclibcgnueabi"
26TARGET_VENDOR = "-angstrom"
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']}"
30
31#mess with compiler flags to use -Os instead of -O2
32#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
33FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
34BUILD_OPTIMIZATION = "-Os"
35CXXFLAGS += "-fvisibility-inlines-hidden"
36 33
37#ARM EABI is softfloat by default, but let's make sure :) 34#ARM EABI is softfloat by default, but let's make sure :)
38TARGET_FPU_arm = "soft" 35#make it overridable for platforms with FPU, like ep93xx or i.mx31
36TARGET_FPU_arm ?= "soft"
37TARGET_FPU_ixp4xx ?= "soft"
38
39 39
40#Always ship these packages 40#Make a LE jffs2 image
41BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit" 41SLUGOS_IMAGESEX = "little-endian"
42 42
43#Name the generated images in a sane way 43#Name the generated images in a sane way
44IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" 44IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
45DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} 45DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
46 46
47# Angstrom *always* has some form of release config, so error out if someone thinks he knows better 47# Angstrom *always* has some form of release config, so error out if someone thinks he knows better
48DISTRO_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')}" 48DISTRO_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')}"
49 49
50# We want images supporting the following features (for task-base) 50# We want images supporting the following features (for task-base)
51DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" 51DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/meta/conf/distro/include/maemo-preferred.inc b/meta/conf/distro/include/maemo-preferred.inc
deleted file mode 100644
index 943f244..0000000
--- a/meta/conf/distro/include/maemo-preferred.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1PREFERRED_PROVIDER_gconf = "gconf-osso"
2PREFERRED_PROVIDER_tslib = "tslib-maemo"
3PREFERRED_VERSION_dbus = "0.23.1-osso5"
4PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
5PREFERRED_PROVIDER_esd = "osso-esd"
6PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
7PREFERRED_VERSION_glib-2.0 = "2.6.4"
8PREFERRED_VERSION_pango = "1.8.1"
9PREFERRED_VERSION_atk = "1.9.0"
10PREFERRED_VERSION_diet-x11 ?= "6.2.1" \ No newline at end of file
diff --git a/meta/conf/distro/include/openzaurus.inc b/meta/conf/distro/include/openzaurus.inc
index 0187795..ea408ff 100644
--- a/meta/conf/distro/include/openzaurus.inc
+++ b/meta/conf/distro/include/openzaurus.inc
@@ -22,4 +22,4 @@ BB_MIN_VERSION = "1.4.4"
22INHERIT += "sanity" 22INHERIT += "sanity"
23 23
24# We want images supporting the following features (for task-base) 24# We want images supporting the following features (for task-base)
25DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" 25DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/meta/conf/distro/include/preferred-gpe-versions-2.7.inc b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc
index 3670202..662dfc3 100644
--- a/meta/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/meta/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -6,8 +6,8 @@
6#SRCDATE_minimo=20050401 6#SRCDATE_minimo=20050401
7 7
8#set some preferred providers: 8#set some preferred providers:
9PREFERRED_PROVIDER_gconf=gconf-dbus 9PREFERRED_PROVIDER_gconf="gconf-dbus"
10PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus 10PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
11 11
12#specify versions, as the header says :) 12#specify versions, as the header says :)
13PREFERRED_VERSION_libmatchbox ?= "1.7" 13PREFERRED_VERSION_libmatchbox ?= "1.7"
@@ -20,9 +20,9 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
20PREFERRED_VERSION_atk ?= "1.9.0" 20PREFERRED_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_pango ?= "1.8.2"
23PREFERRED_VERSION_gtk+ ?= "2.6.10" 24PREFERRED_VERSION_gtk+ ?= "2.6.10"
24PREFERRED_VERSION_gtk-engines ?= "2.6.5" 25PREFERRED_VERSION_gtk-engines ?= "2.6.5"
25PREFERRED_VERSION_pango ?= "1.8.1"
26PREFERRED_VERSION_librsvg ?= "2.6.5" 26PREFERRED_VERSION_librsvg ?= "2.6.5"
27PREFERRED_VERSION_libgpewidget ?= "0.109" 27PREFERRED_VERSION_libgpewidget ?= "0.109"
28PREFERRED_VERSION_libgpepimc ?= "0.5" 28PREFERRED_VERSION_libgpepimc ?= "0.5"
diff --git a/meta/conf/distro/include/preferred-opie-versions.inc b/meta/conf/distro/include/preferred-opie-versions.inc
index 34c1fd4..d7c5b94 100644
--- a/meta/conf/distro/include/preferred-opie-versions.inc
+++ b/meta/conf/distro/include/preferred-opie-versions.inc
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHRE
12PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" 12PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
13PREFERRED_VERSION_qte-mt = "${QTE_VERSION}" 13PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
14PREFERRED_VERSION_qte = "${QTE_VERSION}" 14PREFERRED_VERSION_qte = "${QTE_VERSION}"
15PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" 15PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
16PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" 16PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
17PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" 17PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
18PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" 18PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
diff --git a/meta/conf/distro/include/sane-srcdates.inc b/meta/conf/distro/include/sane-srcdates.inc
index 0696ad1..ffde562 100644
--- a/meta/conf/distro/include/sane-srcdates.inc
+++ b/meta/conf/distro/include/sane-srcdates.inc
@@ -5,7 +5,6 @@ SRCDATE_at76c503a-modules ?= "20060814"
5SRCDATE_prism54-module ?= "20060814" 5SRCDATE_prism54-module ?= "20060814"
6 6
7# X11 libs, extentions and protos 7# X11 libs, extentions and protos
8SRCDATE_xcalibrate ?= "20060804"
9SRCDATE_compositeext ?= "20060814" 8SRCDATE_compositeext ?= "20060814"
10SRCDATE_drm ?= "20060814" 9SRCDATE_drm ?= "20060814"
11SRCDATE_drm-kernel ?= "20060814" 10SRCDATE_drm-kernel ?= "20060814"
@@ -22,8 +21,10 @@ SRCDATE_xxf86vmext ?= "20060814"
22# Matchbox / O-hand 21# Matchbox / O-hand
23SRCDATE_contacts ?= "20060707" 22SRCDATE_contacts ?= "20060707"
24SRCDATE_dates ?= "20060707" 23SRCDATE_dates ?= "20060707"
25SRCDATE_web ?= "20060613" 24SRCDATE_fstests ?= "20061111"
26SRCDATE_eds-dbus ?= "20060707" 25SRCDATE_eds-dbus ?= "20060707"
26SRCDATE_libmatchbox ?= "20060612"
27SRCDATE_libfakekey ?= "20051101"
27SRCDATE_matchbox-common ?= "20060612" 28SRCDATE_matchbox-common ?= "20060612"
28SRCDATE_matchbox-config-gtk ?= "20060612" 29SRCDATE_matchbox-config-gtk ?= "20060612"
29SRCDATE_matchbox-desktop ?= "20060612" 30SRCDATE_matchbox-desktop ?= "20060612"
@@ -33,13 +34,14 @@ SRCDATE_matchbox-panel-manager ?= "20060612"
33SRCDATE_matchbox-stroke ?= "20060612" 34SRCDATE_matchbox-stroke ?= "20060612"
34SRCDATE_matchbox-themes-extra ?= "20060612" 35SRCDATE_matchbox-themes-extra ?= "20060612"
35SRCDATE_matchbox-wm ?= "20060612" 36SRCDATE_matchbox-wm ?= "20060612"
36SRCDATE_libmatchbox ?= "20060612" 37SRCDATE_psplash ?= "20061011"
37SRCDATE_libfakekey ?= "20051101" 38SRCDATE_web ?= "20060613"
38SRCDATE_zaurusd ?= "20060628" 39SRCDATE_zaurusd ?= "20060628"
39 40
40# GPE 41# GPE
41SRCDATE_dasher-gpe ?= "20060814" 42SRCDATE_dasher-gpe ?= "20060814"
42SRCDATE_rosetta ?= "20060804" 43SRCDATE_rosetta ?= "20060804"
44SRCDATE_libmimedir ?= "20060804"
43 45
44# GNOME 46# GNOME
45SRCDATE_gconf-dbus ?= "20060719" 47SRCDATE_gconf-dbus ?= "20060719"
@@ -54,12 +56,13 @@ SRCDATE_dvbtraffic ?= "20060814"
54SRCDATE_dvbtune ?= "20060814" 56SRCDATE_dvbtune ?= "20060814"
55SRCDATE_fdclock ?= "20060814" 57SRCDATE_fdclock ?= "20060814"
56SRCDATE_fltk ?= "20060814" 58SRCDATE_fltk ?= "20060814"
59SRCDATE_ipatience ?= "20061112"
57SRCDATE_ipkg-link ?= "20050930" 60SRCDATE_ipkg-link ?= "20050930"
58SRCDATE_ipkg-link-1 ?= "20050930" 61SRCDATE_ipkg-link-1 ?= "20050930"
59SRCDATE_ipkg-utils ?= "20050930" 62SRCDATE_ipkg-utils ?= "20050930"
60SRCDATE_ipkg-utils-native ?= "20050930" 63SRCDATE_ipkg-utils-native ?= "20050930"
61SRCDATE_kaffe-qt ?= "20060814" 64SRCDATE_kaffe-qt ?= "20060814"
62SRCDATE_kbdd ?= "20060814" 65SRCDATE_kbdd ?= "20061019"
63SRCDATE_led ?= "20060814" 66SRCDATE_led ?= "20060814"
64SRCDATE_linux-input ?= "20060814" 67SRCDATE_linux-input ?= "20060814"
65SRCDATE_madwifi-modules ?= "20060814" 68SRCDATE_madwifi-modules ?= "20060814"
@@ -68,7 +71,7 @@ SRCDATE_minimo ?= "20050401"
68SRCDATE_mystun-server ?= "20060814" 71SRCDATE_mystun-server ?= "20060814"
69SRCDATE_olsrd ?= "20060814" 72SRCDATE_olsrd ?= "20060814"
70SRCDATE_opencvs ?= "20060814" 73SRCDATE_opencvs ?= "20060814"
71SRCDATE_oprofile ?= "20060214" 74SRCDATE_oprofile ?= "20061011"
72SRCDATE_portaudio ?= "20060814" 75SRCDATE_portaudio ?= "20060814"
73SRCDATE_putty ?= "20060814" 76SRCDATE_putty ?= "20060814"
74SRCDATE_python-cairo ?= "20060814" 77SRCDATE_python-cairo ?= "20060814"
diff --git a/meta/conf/distro/openzaurus-unstable.conf b/meta/conf/distro/openzaurus-unstable.conf
index 4349294..10f00b7 100644
--- a/meta/conf/distro/openzaurus-unstable.conf
+++ b/meta/conf/distro/openzaurus-unstable.conf
@@ -8,8 +8,7 @@ DISTRO_VERSION = ".dev-snapshot-${DATE}"
8 8
9CVS_TARBALL_STASH = "\ 9CVS_TARBALL_STASH = "\
10http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ 10http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
11http://www.oesources.org/source/current/" 11"
12
13 12
14require conf/distro/include/sane-srcdates.inc 13require conf/distro/include/sane-srcdates.inc
15require conf/distro/include/openzaurus.inc 14require conf/distro/include/openzaurus.inc
@@ -34,7 +33,7 @@ SRCDATE ?= "20060701"
34ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" 33ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
35PREFERRED_PROVIDER_hostap-conf = "hostap-conf" 34PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
36PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" 35PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
37PREFERRED_PROVIDER_tslib ?= tslib 36PREFERRED_PROVIDER_tslib ?= "tslib"
38 37
39KERNEL_CONSOLE = "ttyS0" 38KERNEL_CONSOLE = "ttyS0"
40#DEBUG_OPTIMIZATION = "-O -g3" 39#DEBUG_OPTIMIZATION = "-O -g3"
@@ -52,8 +51,13 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
52PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" 51PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
53PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" 52PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
54 53
55PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" 54PREFERRED_VERSION_binutils-cross = "2.16"
56PREFERRED_VERSION_binutils = "2.15.94.0.1" 55PREFERRED_VERSION_binutils = "2.16"
56
57PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
58PREFERRED_VERSION_gcc = "3.4.4"
59PREFERRED_VERSION_gcc-cross = "3.4.4"
60PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
57 61
58# 62#
59# Opie 63# Opie
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index bbf8d94..82edf8d 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -13,10 +13,11 @@ PACKAGE_CLASSES ?= "package_ipk"
13INHERIT += " ${PACKAGE_CLASSES} debian multimachine poky devshell " 13INHERIT += " ${PACKAGE_CLASSES} debian multimachine poky devshell "
14# For some reason, this doesn't work 14# For some reason, this doesn't work
15# TARGET_OS ?= "linux" 15# TARGET_OS ?= "linux"
16# TARGET_VENDOR = "-poky"
16TARGET_OS = "linux" 17TARGET_OS = "linux"
17TARGET_FPU_arm ?= "soft" 18TARGET_FPU_arm ?= "soft"
18TARGET_FPU_armeb ?= "soft" 19TARGET_FPU_armeb ?= "soft"
19IMAGE_ROOTFS_SIZE_ext2 ?= 131072 20IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
20 21
21PARALLEL_INSTALL_MODULES = "1" 22PARALLEL_INSTALL_MODULES = "1"
22 23
@@ -50,8 +51,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
50 51
51# Libc/uclibc: 52# Libc/uclibc:
52#fix some iconv issues, needs to be adjusted when doing uclibc builds 53#fix some iconv issues, needs to be adjusted when doing uclibc builds
53PREFERRED_PROVIDER_virtual/libiconv ?= glibc 54PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
54PREFERRED_PROVIDER_virtual/libintl ?= glibc 55PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
55 56
56# Virtuals: 57# Virtuals:
57PREFERRED_PROVIDER_virtual/db ?= "db" 58PREFERRED_PROVIDER_virtual/db ?= "db"
@@ -62,9 +63,9 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cwo
62 63
63# Others: 64# Others:
64PREFERRED_PROVIDER_libx11 ?= "diet-x11" 65PREFERRED_PROVIDER_libx11 ?= "diet-x11"
65PREFERRED_PROVIDER_gconf ?= gconf-dbus 66PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
66PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus 67PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs-dbus"
67PREFERRED_PROVIDER_tslib ?= tslib 68PREFERRED_PROVIDER_tslib ?= "tslib"
68 69
69 70
70# 71#
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 699ac21..62622ea 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -1,6 +1,6 @@
1# this file holds documentation for known keys, possible values and 1# this file holds documentation for known keys, possible values and
2# their meaning. Please update, correct and extend this documentation. 2# their meaning. Please update, correct and extend this documentation.
3# Mail your changes to oe@handhelds.org 3# Mail your changes to openembedded-devel@openembedded.org
4 4
5# conf/bitbake.conf 5# conf/bitbake.conf
6PREFERRED_VERSION[doc] = 'Normally use it as PREFERRED_VERSION_package-name = "" to set the preferred \ 6PREFERRED_VERSION[doc] = 'Normally use it as PREFERRED_VERSION_package-name = "" to set the preferred \
@@ -57,7 +57,7 @@ PRIORITY[doc] = "Importance of package, default values are 'optional' or 'needed
57DESCRIPTION[doc] = "A small description of the package." 57DESCRIPTION[doc] = "A small description of the package."
58LICENSE[doc] = "The license of the resulting package e.g. GPL" 58LICENSE[doc] = "The license of the resulting package e.g. GPL"
59AUTHOR[doc] = "The author of the files installed." 59AUTHOR[doc] = "The author of the files installed."
60MAINTAINER[doc] = "Maintainer of the .bb file and the resulting package." 60MAINTAINER[doc] = "Distributions can put this in their .conf file to add their contact information into packages, this is not valid inside recipes"
61HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net." 61HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net."
62 62
63 63
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
index 0b0caeb..27695be 100644
--- a/meta/conf/machine/akita.conf
+++ b/meta/conf/machine/akita.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
4 4
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
6include conf/machine/include/zaurus-clamshell-2.6.conf 6include conf/machine/include/zaurus-2.6.conf
7 7
8PACKAGE_EXTRA_ARCHS += "iwmmxt" 8PACKAGE_EXTRA_ARCHS += "iwmmxt"
9IMAGE_FSTYPES ?= "jffs2" 9IMAGE_FSTYPES ?= "jffs2"
diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf
index 4b1d8ed..893378f 100644
--- a/meta/conf/machine/c7x0.conf
+++ b/meta/conf/machine/c7x0.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
4 4
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
6include conf/machine/include/zaurus-clamshell-2.6.conf 6include conf/machine/include/zaurus-2.6.conf
7 7
8IMAGE_FSTYPES ?= "jffs2" 8IMAGE_FSTYPES ?= "jffs2"
9 9
diff --git a/meta/conf/machine/include/ixp4xx.conf b/meta/conf/machine/include/ixp4xx.conf
index e545bbc..190ebe1 100644
--- a/meta/conf/machine/include/ixp4xx.conf
+++ b/meta/conf/machine/include/ixp4xx.conf
@@ -141,28 +141,12 @@ PACKAGE_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
141 bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \ 141 bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \
142 ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}" 142 ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}"
143 143
144# PACKAGE_ARCH_LIST [not used] 144# IPKG_ARCH_LIST [not used]
145# This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing 145# This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing
146# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and 146# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and
147# ixp4xx are included at the start (lower priority) as the non-byte-sex specific 147# ixp4xx are included at the start (lower priority) as the non-byte-sex specific
148# versions. 148# versions.
149PACKAGE_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}" 149IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}"
150
151#-------------------------------------------------------------------------------
152# Package versions
153#-------------------------------------------------------------------------------
154# Warning: these are shared across the different machine and distro
155# configurations but can be overridden therein if required.
156SRCDATE_ipkg-utils ?= "20060106"
157SRCDATE_ipkg-utils-native ?= "20060106"
158SRCDATE_ipkg-link ?= "20060106"
159SRCDATE_irssi ?= "20050930"
160
161CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
162INHERIT += "nslu2-mirrors"
163
164PREFERRED_VERSION_ipkg ?= "0.99.154"
165PREFERRED_VERSION_ipkg-native ?= "0.99.154"
166 150
167#------------------------------------------------------------------------------- 151#-------------------------------------------------------------------------------
168# Board defaults 152# Board defaults
diff --git a/meta/conf/machine/include/poodle-2.6.conf b/meta/conf/machine/include/poodle-2.6.conf
index eff0ad4..01a06b7 100644
--- a/meta/conf/machine/include/poodle-2.6.conf
+++ b/meta/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
require conf/machine/include/zaurus-clamshell-2.6.conf require conf/machine/include/zaurus-2.6.conf
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf
index c896c38..83ddf24 100644
--- a/meta/conf/machine/include/qemu.conf
+++ b/meta/conf/machine/include/qemu.conf
@@ -1,6 +1,7 @@
1PCMCIA_MANAGER = "pcmciautils" 1PCMCIA_MANAGER = "pcmciautils"
2PREFERRED_PROVIDER_xserver = "xserver-kdrive" 2PREFERRED_PROVIDER_xserver = "xserver-kdrive"
3GUI_MACHINE_CLASS = "bigscreen" 3GUI_MACHINE_CLASS = "bigscreen"
4GPE_EXTRA_INSTALL += "gaim sylpheed"
4 5
5MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" 6MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
6 7
diff --git a/meta/conf/machine/include/tosa-2.6.conf b/meta/conf/machine/include/tosa-2.6.conf
index 6831b0e..f3591b4 100644
--- a/meta/conf/machine/include/tosa-2.6.conf
+++ b/meta/conf/machine/include/tosa-2.6.conf
@@ -1,4 +1,4 @@
1include conf/machine/include/zaurus-clamshell-2.6.conf 1include conf/machine/include/zaurus-2.6.conf
2# wlan-ng Modules 2# wlan-ng Modules
3MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" 3MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
4 4
diff --git a/meta/conf/machine/include/tune-arm920t.conf b/meta/conf/machine/include/tune-arm920t.conf
index 992f192..373bf46 100644
--- a/meta/conf/machine/include/tune-arm920t.conf
+++ b/meta/conf/machine/include/tune-arm920t.conf
@@ -1,3 +1,3 @@
1PACKAGE_ARCH = "armv4t" 1PACKAGE_ARCH = "armv4t"
2TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t -mcpu=arm920t" 2TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
3 3
diff --git a/meta/conf/machine/include/tune-arm9tdmi.conf b/meta/conf/machine/include/tune-arm9tdmi.conf
index cfc3bad..d097b07 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.conf
+++ b/meta/conf/machine/include/tune-arm9tdmi.conf
@@ -1 +1,2 @@
1PACKAGE_ARCH = "armv4t"
1TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" 2TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/meta/conf/machine/include/tune-iwmmxt.conf b/meta/conf/machine/include/tune-iwmmxt.conf
index f9c8e7f..8376fac 100644
--- a/meta/conf/machine/include/tune-iwmmxt.conf
+++ b/meta/conf/machine/include/tune-iwmmxt.conf
@@ -1,6 +1,6 @@
1# Configurations for the Intel PXA27x Appications Processor Family. 1# Configurations for the Intel PXA27x Appications Processor Family.
2# Please use tune-xscale for PXA255/PXA26x based processors. 2# Please use tune-xscale for PXA255/PXA26x based processors.
3PACKAGE_EXTRA_ARCHS += "iwmmxt"
4TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" 3TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
5PACKAGE_ARCH = "iwmmxt" 4PACKAGE_ARCH = "iwmmxt"
5PACKAGE_EXTRA_ARCHS += "iwmmxt"
6 6
diff --git a/meta/conf/machine/include/zaurus-clamshell-2.6.conf b/meta/conf/machine/include/zaurus-2.6.conf
index e0a9e38..ce9b44c 100644
--- a/meta/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/meta/conf/machine/include/zaurus-2.6.conf
@@ -6,10 +6,10 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7"
6 6
7PCMCIA_MANAGER ?= "pcmciautils" 7PCMCIA_MANAGER ?= "pcmciautils"
8 8
9MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget" 9MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen"
10MACHINE_FEATURES_akita = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost" 10MACHINE_FEATURES_append_tosa = " usbhost usbwlanng "
11MACHINE_FEATURES_spitz = "kernel26 apm alsa pcmcia bluetooth irda usbgadget usbhost ext2" 11MACHINE_FEATURES_append_akita = " usbhost "
12 12MACHINE_FEATURES_append_spitz = " usbhost ext2 "
13 13
14MACHINE_EXTRA_RDEPENDS = "zaurusd" 14MACHINE_EXTRA_RDEPENDS = "zaurusd"
15MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" 15MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi"
@@ -17,4 +17,4 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz"
17MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" 17MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz"
18MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" 18MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
19 19
20MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file 20MACHINE_TASK_PROVIDER = "task-base"
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index 2e22771..6bde574 100644
--- a/meta/conf/machine/nokia770.conf
+++ b/meta/conf/machine/nokia770.conf
@@ -2,7 +2,7 @@
2#@NAME: Nokia 770 internet tablet 2#@NAME: Nokia 770 internet tablet
3#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet 3#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
4TARGET_ARCH = "arm" 4TARGET_ARCH = "arm"
5PACKAGE_EXTRA_ARCHS = "armv4 armv5te" 5PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
6 6
7PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" 7PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
8PREFERRED_PROVIDER_virtual/bootloader = "" 8PREFERRED_PROVIDER_virtual/bootloader = ""
@@ -33,4 +33,4 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
33MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" 33MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
34MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" 34MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
35 35
36MACHINE_TASK_PROVIDER = "task-base" \ No newline at end of file 36MACHINE_TASK_PROVIDER = "task-base"
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index cf2c5f3..2c4e109 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device 3#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
4 4
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
6include conf/machine/include/zaurus-clamshell-2.6.conf 6include conf/machine/include/zaurus-2.6.conf
7 7
8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
9 9
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index 5a6e3de..58313f2 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -3,6 +3,6 @@
3# See sanity.bbclass 3# See sanity.bbclass
4# 4#
5# Expert users can confirm their sanity with "touch conf/sanity.conf" 5# Expert users can confirm their sanity with "touch conf/sanity.conf"
6BB_MIN_VERSION = "1.4.3" 6BB_MIN_VERSION = "1.6.2"
7INHERIT += "sanity" 7INHERIT += "sanity"
8 8