Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/03/26 17:01:49+01:00 nslu2-linux.org!perlguru
openslug-packages.bb:
  Added CVS

2005/03/26 06:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 15:07:57+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/openembedded

2005/03/26 15:05:31+01:00 vanille.de!mickeyl
This ChangeSet introduces .inc files for everything Opie related
Fixed and floating versions only differ in PV and SRC_URI, so that's
what gets overridden in the actual .bbfiles. Please watch out for breakage
and catch up if I missed files.
Unfortunately, for now I had to yank the few individually versioned Opie
programs. We will bring individual versions for many (if not all) programs
back eventually.

2005/03/26 14:14:13+01:00 mauricekoster.com!maurice
openslug-packages.bb:
  Added rsync

2005/03/26 04:41:37-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 13:06:25+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 13:06:05+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb:
  fix deps

2005/03/26 03:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 12:07:48+01:00 uni-frankfurt.de!mickeyl
opie-1.2.0 uses qcop 1.0.1

2005/03/26 12:06:49+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/26 12:03:13+01:00 utwente.nl!koen
libgphoto2_2.1.5.bb, gphoto2_2.1.5.bb: add latest and greatest gphoto2, features improved ptp2 support

2005/03/26 12:02:29+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/03/26 12:00:56+01:00 uni-frankfurt.de!mickeyl
opie-taskbar-1.2.0: catch up with cvs version

2005/03/26 11:51:00+01:00 uni-frankfurt.de!mickeyl
use opie 1.2.0 in familiar 0.8.2

2005/03/26 11:44:24+01:00 uni-frankfurt.de!mickeyl
libqpe-opie-1.2.0: catch up with cvs version

2005/03/25 20:41:33-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 23:09:00-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/03/25 23:08:40-05:00 handhelds.org!kergoth
Add linux-libc-headers 2.6.11.1.

2005/03/25 16:44:54-08:00 kalmiopsis!jbowler
ssh does not allow login as a user unless that user has a password.
Unmodified NSLU2 boxes running OpenSlug only allow login via dropbear
(ssh), therefore a password is required for root (the only user in
the initial setup.)  This changed version of the root-home.patch
adds a password, the password is documented in the README file.

2005/03/25 15:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/26 00:02:41+01:00 vanille.de!mickeyl
oz.conf: last updates - approaching 3.5.3

2005/03/25 07:41:37-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 16:05:02+01:00 uni-frankfurt.de!mickeyl
switch oz-3.5.3 to release mode and update

2005/03/25 04:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 13:29:29+01:00 uni-frankfurt.de!mickeyl
add generic distro configuration and x86 machine configuration

2005/03/25 00:35:27-10:00 (none)!dyoung
change DISTRO_TYPE from = to ?= construct to simplify future testing.

2005/03/24 23:55:09-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/openembedded

2005/03/24 23:54:07-10:00 (none)!dereky
openslug-image.bb:
  change base-passwd to version 3.5.9

2005/03/25 01:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/25 10:37:35+01:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/03/25 10:37:05+01:00 utwente.nl!koen
x11_cvs.bb:  fix is upstream now, threads.patch is obsolete now

2005/03/24 17:41:35-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 20:29:38-05:00 handhelds.org!kergoth
Add unionfs version 1.0.11.

2005/03/25 09:16:21+10:30 (none)!rwhitby
Fixed the nsswitch.conf for Unslung

2005/03/25 07:38:46+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded

2005/03/25 07:38:18+10:30 (none)!rwhitby
Added /etc/nsswitch.conf to Unslung rootfs

2005/03/24 12:41:31-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 21:04:24+01:00 zeckescompany.nl!alwin
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into zeckescompany.nl:/home/ral/progs/Zaurus/oe/openembedded

2005/03/24 21:04:07+01:00 zeckescompany.nl!alwin
fixed typo in base-files/c7x0/fstab

2005/03/24 10:41:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 19:07:47+01:00 utwente.nl!koen
x11_cvs.bb:  add threads.patch

2005/03/24 02:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 11:12:07+01:00 uni-frankfurt.de!mickeyl
base.bbclass: add function base_conditional that serves as an equivalent of the
'?' operator in C. this is very handy to simplify some constructs in our .bb files, i.e. appending things based on if a variable has a
certain value or not. Example Use: SRC_URI_append = '{base_conditional(DISTRO_TYPE,debug,file://allow-root-pw.patch,'',d)}'

2005/03/24 11:01:31+01:00 uni-frankfurt.de!mickeyl
bump timezones to 1.2.0

2005/03/24 01:41:28-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 10:17:49+01:00 handhelds.org!CoreDump
Just a test, no changes

2005/03/23 17:41:24-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 01:59:38+01:00 handhelds.org!zecke
Libopie2 Visibility changes:
	-There is no difference between 1.2.0 and cvs in regards to visibility
	-Quote the string inside the message
	-Remove include-cvs.pro as it is not needed anymore

2005/03/23 16:41:34-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 00:45:36+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/opie_move

2005/03/24 00:44:26+01:00 handhelds.org!zecke
Opie 1.1.9 -> 1.2.0:
	-increment PV on the _cvs.bb files
	-remove PR from the .bb files

2005/03/23 15:41:25-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/03/24 00:37:00+01:00 handhelds.org!zecke
Opie 1.1.9 -> 1.2.0:
	Update courtsey python and kergoths super cow power über sed skills

	-mv 1.1.9.bb to 1.2.0.bb
	-remove PR fromm 1.2.0.bb and _cvs.bb
	-bump PV in the _cvs.bb

2005/03/24 00:31:44+01:00 zeckescompany.nl!alwin
corrected corgikeymap

BKrev: 42459626c9gSuz7RwCyChCjKFbynfA

7 files changed, 18 insertions, 311 deletions

diff --git a/conf/distro/familiar-0.8.2.conf b/conf/distro/familiar-0.8.2.conf
index 42b812269f..1da111ff50 100644
--- a/conf/distro/familiar-0.8.2.conf
+++ b/conf/distro/familiar-0.8.2.conf
@@ -32,7 +32,7 @@ PREFERRED_VERSION_libtool-cross= "1.5.6"
 PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 PREFERRED_VERSION_qte = "2.3.10"
 
-#OPIE_VERSION = "1.2.0"
+OPIE_VERSION = "1.2.0"
 include conf/distro/preferred-opie-versions.inc
 
 #
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/generic.conf
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 936ff82511..54a464204d 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -4,7 +4,7 @@
 
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "1.7-beta"
-DISTRO_TYPE = "beta"
+DISTRO_TYPE ?= "beta"
 
 TARGET_FPU = "soft"
 TARGET_OS = "linux"
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
deleted file mode 100644
index df4407ddeb..0000000000
--- a/conf/distro/openzaurus-3.5.1.conf
+++ /dev/null
@@ -1,293 +0,0 @@
-include conf/distro/openzaurus.conf
-DISTRO = "openzaurus"
-
-FEED_URIS_openzaurus = "OZ-3.5.1##http://openzaurus.org/official/unstable/3.5.1/feed/ \
-  		        OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.1/upgrades/"
-
-CVSDATE = 20040915
-ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "tty1"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
-PREFERRED_VERSION_gcc-cross = "3.4.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
-PREFERRED_VERSION_libtool-native = "1.5.6"
-PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte = "2.3.7"
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
-PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
-PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
-
-#
-# Opie
-#
-
-OPIE_VERSION = "1.1.6"
-PREFERRED_VERSION_libopie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "1.0.1"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-checkbook = "0.8.0"
-PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oxygen = "1.0.0"
-PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qashmoney = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qcop = "1.0.0"
-PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ubrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wellenreiter = "1.0.3"
-PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
-
-#
-# GPE
-#
-
-PREFERRED_VERSION_libmatchbox = "1.2"
-PREFERRED_VERSION_matchbox = "0.8.1"
-PREFERRED_VERSION_matchbox-common = "0.8"
-PREFERRED_VERSION_matchbox-desktop = "0.8.1"
-PREFERRED_VERSION_matchbox-wm = "0.8.2"
-PREFERRED_VERSION_matchbox-panel = "0.8.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
-PREFERRED_VERSION_gtk+ = "2.4.4"
-PREFERRED_VERSION_libgpewidget = "0.90"
-PREFERRED_VERSION_libgpepimc = "0.3"
-PREFERRED_VERSION_libgpevtype = "0.4"
-PREFERRED_VERSION_libschedule = "0.13"
-PREFERRED_VERSION_gpe-icons = "0.22"
-PREFERRED_VERSION_libgsm = "1.0.10"
-PREFERRED_VERSION_diet-x11 = "6.2.1"
-PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "3.7"
-PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
-PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost = "0.0cvs20040413"
-PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.73"
-PREFERRED_VERSION_gpe-session-scripts = "0.61"
-PREFERRED_VERSION_gpe-soundserver = "0.4-1"
-PREFERRED_VERSION_gpe-todo = "0.48"
-PREFERRED_VERSION_gpe-calendar = "0.56"
-PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.29"
-PREFERRED_VERSION_gpe-today = "0.08"
-PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.21"
-PREFERRED_VERSION_gpe-bluetooth = "0.36.3"
-PREFERRED_VERSION_gpe-su = "0.18"
-PREFERRED_VERSION_gpe-conf = "0.1.19"
-PREFERRED_VERSION_gpe-clock = "0.14"
-PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.38"
-PREFERRED_VERSION_gpe-shield = "0.6"
-PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager = "0.17"
-PREFERRED_VERSION_keylaunch = "2.0.7"
-PREFERRED_VERSION_minilite = "0.44"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_gpe-edit = "0.28"
-PREFERRED_VERSION_gpe-gallery = "0.95"
-PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.0.12"
-PREFERRED_VERSION_gpe-soundbite = "1.0.5"
-PREFERRED_VERSION_gpe-terminal = "1.1"
-PREFERRED_VERSION_gpe-watch = "0.10"
-PREFERRED_VERSION_gpe-what = "0.31"
-PREFERRED_VERSION_gpe-filemanager = "0.20"
-PREFERRED_VERSION_gpe-go = "0.05"
-PREFERRED_VERSION_gpe-irc = "0.07"
-PREFERRED_VERSION_gpe-lights = "0.12"
-PREFERRED_VERSION_gpe-nmf = "0.19"
-PREFERRED_VERSION_gpe-othello = "0.2-1"
-PREFERRED_VERSION_gpe-plucker = "0.1"
-PREFERRED_VERSION_gpe-session-scripts = "0.61"
-PREFERRED_VERSION_gpe-tetris = "0.6-2"
-PREFERRED_VERSION_gsoko = "0.4.2-gpe5"
-PREFERRED_VERSION_xdemineur = "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
-PREFERRED_VERSION_linphone = "0.12.2"
-PREFERRED_VERSION_firefox = "0.9.3"
-
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index f051f7b5ad..bb383a3944 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -1,19 +1,19 @@
 include conf/distro/openzaurus.conf
 DISTRO = "openzaurus"
 DISTRO_NAME = "OpenZaurus"
-DISTRO_VERSION = "3.5.2-snapshot-${DATE}"
-# DISTRO_VERSION = "3.5.3"
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
+# DISTRO_VERSION = "3.5.2-snapshot-${DATE}"
+DISTRO_VERSION = "3.5.3"
+# DISTRO_TYPE = "debug"
+DISTRO_TYPE = "release"
 
 FEED_URIS += " \
-	upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/ 	\
-	base##http://openzaurus.org/official/unstable/3.5.2/feed/base/		\
-	libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/		\
-	console##http://openzaurus.org/official/unstable/3.5.2/feed/console     \
-	devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
+	upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ 	\
+	base##http://openzaurus.org/official/unstable/3.5.3/feed/base/		\
+	libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/		\
+	console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
+	devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
 
-CVSDATE = "20050320"
+CVSDATE = "20050326"
 
 #
 # Zaurus
@@ -21,7 +21,7 @@ CVSDATE = "20050320"
 
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "tty1"
+KERNEL_CONSOLE = "ttyS0"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/openzaurus-3.5.4.conf
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc
index 828f79b8b6..2530f028ec 100644
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/preferred-opie-versions.inc
@@ -29,9 +29,9 @@ PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "1.0.3"
+PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-checkbook = "0.8.0"
+PREFERRED_VERSION_opie-checkbook = "${OPIE_CHECKBOOK}"
 PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
@@ -106,7 +106,7 @@ PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oxygen = "1.0.0"
+PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
@@ -117,7 +117,7 @@ PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qcop = "1.0.0"
+PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
@@ -177,7 +177,7 @@ PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wellenreiter = "1.0.4"
+PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"