merge of '967336334b2d3b22623c9851eb0ab8a2f5ad19c2'

     and 'f1ce41fae2ee4dc6bfc75fb8d991a37869ef24d8'

38 files changed, 507 insertions, 52 deletions

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 25b07e0038..7935672795 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -1,4 +1,3 @@
-DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index f0e1ec2ad8..ef0fa80f65 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -13,7 +13,6 @@
 # of some packages. If you encounter such a problem please provide a recipe
 # or file a bug!
 
-DISTRO = "chinook-compat"
 DISTRO_NAME = "Chinook-compat"
 DISTRO_VERSION = "test-${DATE}"
 DISTRO_TYPE = "debug"
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index fe079db92d..8e26a282ab 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -10,7 +10,6 @@ FOONAS_MODE ?= "glibc"
 ANGSTROM_MODE = ${FOONAS_MODE}
 require conf/distro/angstrom-2008.1.conf
 
-DISTRO = "foonas"
 DISTRO_NAME = "foonas"
 DISTRO_VERSION = "1.0-dev"
 DISTRO_REVISION = "1"
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
index d712fadb8c..d712fadb8c 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 380c882c2c..08cf27ba57 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -146,7 +146,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-xorg-versions.inc
-require conf/distro/include/angstrom-2007-preferred-versions.inc
+require conf/distro/include/angstrom-2007-for-openmoko-versions.inc
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 1502833389..d14c6f1b19 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -3,6 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index e039a144d3..f9941c8a9a 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -9,6 +9,7 @@ SRCREV_pn-ezxd ?= "${AUTOREV}"
 SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}"
 SRCREV_pn-fstests ?= "${AUTOREV}"
 SRCREV_pn-gnuradio ?= "${AUTOREV}"
+SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
 SRCREV_pn-hildon-1 ?= "${AUTOREV}"
 SRCREV_pn-kismet ?= "${AUTOREV}"
 SRCREV_pn-kismet-newcore ?= "${AUTOREV}"
@@ -81,6 +82,8 @@ SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
 SRCREV_pn-psplash ?= "${AUTOREV}"
 SRCREV_pn-settings-daemon ?= "${AUTOREV}"
 SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
new file mode 100644
index 0000000000..b04f72180d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -0,0 +1,286 @@
+# see http://www.x.org/wiki/Releases/7.4
+# WORK IN PROGRESS, 7.4 will be released on 2008-03-01
+
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext ?= "libxext"
+PREFERRED_PROVIDER_xext ?= "libxext"
+PREFERRED_PROVIDER_libxi ?= "libxi"
+PREFERRED_PROVIDER_libxft ?= "libxft"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_libxpm ?= "libxpm"
+PREFERRED_PROVIDER_xpm ?= "libxpm"
+PREFERRED_PROVIDER_libxt ?= "libxt"
+PREFERRED_PROVIDER_libxaw ?= "libxaw"
+PREFERRED_PROVIDER_libice ?= "libice"
+PREFERRED_PROVIDER_libxrender ?= "libxrender"
+PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
+PREFERRED_PROVIDER_xextensions ?= "xextensions"
+PREFERRED_PROVIDER_xproto ?= "xproto"
+PREFERRED_PROVIDER_x11 ?= "libx11"
+PREFERRED_PROVIDER_libxv ?= "libxv"
+PREFERRED_PROVIDER_xft ?= "libxft"
+PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
+PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
+PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
+PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
+PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
+PREFERRED_PROVIDER_libxmu ?= "libxmu"
+PREFERRED_PROVIDER_libsm ?= "libsm"
+PREFERRED_PROVIDER_xrandr ?= "xrandr"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg ?= "X11R7.4"
+
+# app
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_bdftopcf ?= "1.0.1"
+PREFERRED_VERSION_beforelight ?= "1.0.3"
+PREFERRED_VERSION_bitmap ?= "1.0.3"
+PREFERRED_VERSION_editres ?= "1.0.3"
+PREFERRED_VERSION_fontosfnt ?= "1.0.3"
+PREFERRED_VERSION_fslsfonts ?= "1.0.1"
+PREFERRED_VERSION_fstobdf ?= "1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "1.0.1"
+PREFERRED_VERSION_listres ?= "1.0.1"
+PREFERRED_VERSION_luit ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir ?= "1.0.3"
+PREFERRED_VERSION_mkfontscale ?= "1.0.3"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rgb ?= "1.0.1"
+PREFERRED_VERSION_rstart ?= "1.0.2"
+PREFERRED_VERSION_scripts ?= "1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_smproxy ?= "1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_x11perf ?= "1.4.1"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbiff ?= "1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "1.0.1"
+PREFERRED_VERSION_xclock ?= "1.0.3"
+PREFERRED_VERSION_xcmsdb ?= "1.0.1"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.2"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xdriinfo ?= "1.0.2"
+PREFERRED_VERSION_xedit ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.2"
+PREFERRED_VERSION_xeyes ?= "1.0.1"
+PREFERRED_VERSION_xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.2"
+PREFERRED_VERSION_xfs ?= "1.0.5"
+PREFERRED_VERSION_xfsinfo ?= "1.0.1"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.2"
+PREFERRED_VERSION_xgc ?= "1.0.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xinit ?= "1.0.7"
+PREFERRED_VERSION_xinput ?= "1.3.0"
+PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbevd ?= "1.0.2"
+PREFERRED_VERSION_xkbprint ?= "1.0.1"
+PREFERRED_VERSION_xkbutils ?= "1.0.1"
+PREFERRED_VERSION_xkill ?= "1.0.1"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "1.0.1"
+PREFERRED_VERSION_xlsclients ?= "1.0.1"
+PREFERRED_VERSION_xlsfonts ?= "1.0.2"
+PREFERRED_VERSION_xmag ?= "1.0.2"
+PREFERRED_VERSION_xman ?= "1.0.3"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xpr ?= "1.0.2"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "1.0.3"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xrefresh ?= "1.0.2"
+PREFERRED_VERSION_xrx ?= "1.0.1"
+PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.1"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_xwd ?= "1.0.1"
+PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwud ?= "1.0.1"
+
+# data
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
+
+# doc
+PREFERRED_VERSION_xorg-docs ?= "1.4"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+
+# driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.3"
+PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-apm ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-ark ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.81.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
+PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-glint ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.2.0"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.7"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1"
+PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
+PREFERRED_VERSION_xf86-video-sis ?= "0.9.4"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.15.2"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+
+# font
+PREFERRED_VERSION_encodings ?= "1.0.2"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-util-native ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.0.1"
+
+# lib
+PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libx11 ?= "1.1.3"
+PREFERRED_VERSION_libx11-native ?= "1.1.1"
+PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.9"
+PREFERRED_VERSION_libxdamage ?= "1.0.4"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.3"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxi ?= "1.1.3"
+PREFERRED_VERSION_libxinerama ?= "1.0.2"
+PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_libxmu ?= "1.0.4"
+PREFERRED_VERSION_libxpm ?= "3.5.7"
+PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrender ?= "0.9.4"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_xtrans ?= "1.0.4"
+
+# proto
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_glproto ?= "1.4.9"
+PREFERRED_VERSION_inputproto ?= "1.4.2.1"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
+PREFERRED_VERSION_xproto-native ?= "7.0.11"
+PREFERRED_VERSION_xproto ?= "7.0.11"
+
+# util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_util-macros-native ?= "1.1.5"
+PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+
+# xserver
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.4"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index c8b67efb7a..a585fdeca6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -26,7 +26,8 @@ SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "42"
+SRCREV_pn-gsm0710muxd ?= "73"
+SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-kismet ?= "2285"
@@ -42,9 +43,10 @@ SRCREV_pn-libmokopanelui2 ?= "3349"
 SRCREV_pn-libmokoui2 ?= "3688"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
+SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1021"
+SRCREV_pn-linux-ixp4xx ?= "1039"
 SRCREV_pn-linux-openmoko ?= "4014"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -118,11 +120,14 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
+SRCREV_pn-opkg ?= "4022"
+SRCREV_pn-opkg-native ?= "4019"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-fso-pyproto = "49"
+SRCREV_pn-python-fso-pyproto = "70"
 SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
index 19379862ae..3a7c7ee549 100644
--- a/conf/distro/jlime-shrek.conf
+++ b/conf/distro/jlime-shrek.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
 #@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
 
-DISTRO = "Jornada Linux Mobility Edition"
 DISTRO_NAME = "JLime"
 DISTRO_VERSION = "Shrek"
 DISTRO_TYPE = "release"
diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf
index 26bf8b94f1..bf055874e8 100644
--- a/conf/distro/mamona.conf
+++ b/conf/distro/mamona.conf
@@ -3,7 +3,6 @@
 #@NAME: Mamona 
 #@--------------------------------------------------------------------
 
-DISTRO = "mamona"
 DISTRO_NAME = Mamona""
 DISTRO_VERSION = "test-${DATE}"
 DISTRO_TYPE = "debug"
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index d68a03fa2b..f8ea1ee5af 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -8,7 +8,6 @@
 # MokoSlug is based on Angstrom, and would hopefully just be done by features one day ...
 require conf/distro/angstrom-2008.1.conf
 
-DISTRO = "mokoslug"
 DISTRO_NAME = "MokoSlug"
 DISTRO_VERSION = "1.0-alpha"
 DISTRO_REVISION = "1"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index dd6c2e0b7e..b08e5f2ddb 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -10,7 +10,6 @@ require conf/distro/include/angstrom-2007-for-openmoko.inc
 #
 # Header
 #
-DISTRO = "openmoko"
 DISTRO_NAME = "OpenMoko"
 DISTRO_VERSION = "P1-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 4c3112df78..add4c7e2d9 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
 SERIAL_CONSOLE = "115200"
 
 # used by some images
+IMAGE_FSTYPES ?= "jffs2"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 07616915aa..ba0c9f9a70 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index b6ccd7ef0d..3b9d5188f6 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index bf45d25c43..95c7626a63 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -15,7 +15,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
-
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
index 532193a567..f875d437c7 100644
--- a/conf/machine/bd-neon.conf
+++ b/conf/machine/bd-neon.conf
@@ -41,6 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-module-nls-cp437 \
 				kernel-module-af-key \
 				kernel-module-i2c-pxa"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x40000 --pad=32243712; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index ad0c64bef2..bfaf5ed793 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -36,6 +36,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
 # build / upload tools
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index bd9621413a..2c2034b1b6 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -26,7 +26,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-snd-soc-neo1973-gta02-wm8753 \
-  kernel-module-snd-soc-smdk2440 \
 "
 
 SERIAL_CONSOLE = "115200 ttySAC2"
diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf
index ce45606dbd..ac4c1ef4b6 100644
--- a/conf/machine/gesbc-9302.conf
+++ b/conf/machine/gesbc-9302.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5"
+PREFERRED_VERSION_linux ?= "2.6.24"
 
 #don't try to access tty1
 USE_VT = "0"
@@ -19,6 +19,7 @@ SERIAL_CONSOLE = "57600 ttyAM0"
 # used by some images
 ROOT_FLASH_SIZE = "8"
 #extra jffs2 tweaks
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
 #tune for ep93xx cpus
diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf
new file mode 100644
index 0000000000..1b854582f8
--- /dev/null
+++ b/conf/machine/gumstix-custom-connex.conf
@@ -0,0 +1,75 @@
+#
+# Use this file as a starting point for your custom gumstix configuration
+# Edit it to reflect your hardware setup and then save it a parallel location in user.collection
+
+MACHINE_FEATURES += "connex"
+require conf/machine/include/gumstix.inc
+require conf/machine/include/tune-xscale.inc
+
+#
+# Your flash size = Total flash (in MB) - 1 (for linux kernel partition)
+#ROOT_FLASH_SIZE = "3"
+ROOT_FLASH_SIZE = "15"
+
+#
+# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1"
+USE_VT = "0"
+#USE_VT = "1"
+#SYSVINIT_ENABLED_GETTYS = "1"
+
+#
+# Uncomment features that your board set supports
+
+#MACHINE_FEATURES += "usbhost"
+MACHINE_FEATURES += "usbgadget"
+
+MACHINE_FEATURES  += "i2c"
+#MACHINE_FEATURES  += "spi"
+
+MACHINE_FEATURES  += "serial"
+MACHINE_FEATURES  += "bluetooth"
+MACHINE_FEATURES  += "sound"
+
+# if you enable robostix you will need to disable both "lcd" and "touchscreen" features
+#MACHINE_FEATURES  += "robostix"
+
+#MACHINE_FEATURES  += "lcd"
+#MACHINE_FEATURES  += "touchscreen"
+#MACHINE_FEATURES  += "keyboard"
+
+MACHINE_FEATURES  += "pcmcia"
+#MACHINE_FEATURES  += "mmc"
+
+MACHINE_FEATURES  += "wifi"
+MACHINE_FEATURES  += "ethernet"
+
+MACHINE_FEATURES  += "fat"
+#MACHINE_FEATURES  += "ext2"
+
+#
+# note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
+# for those features via task-base-gumstix.  Include below any extra kernel modules that you want installed
+
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx"
+
+#
+# Uncomment or add kernel modules that should be autoloaded
+
+module_autoload_proc_gpio      = 'proc_gpio'
+
+module_autoload_pcmcia         = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pcmcia', '',d)}
+module_autoload_pxa2xx_cs      = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pxa2xx_cs', '',d)}
+
+module_autoload_pxamci         = ${@base_contains('MACHINE_FEATURES', 'mmc',        'pxamci', '',d)}
+module_autoload_mmc_block      = ${@base_contains('MACHINE_FEATURES', 'mmc',        'mmc_block', '',d)}
+
+module_autoload_ethernet       = ${@base_contains('MACHINE_FEATURES', 'ethernet',   'ethernet', '',d)}
+
+module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'gumstix_gadget', '',d)}
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_file_storage', '',d)}
+module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_ether', '',d)}
+#module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
+
+module_autoload_ucb1400-ts     = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)}
+module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
+
diff --git a/conf/machine/gumstix-custom-verdex.conf b/conf/machine/gumstix-custom-verdex.conf
new file mode 100644
index 0000000000..f2488d66e1
--- /dev/null
+++ b/conf/machine/gumstix-custom-verdex.conf
@@ -0,0 +1,78 @@
+#
+# Use this file as a starting point for your custom gumstix configuration
+# Edit it to reflect your hardware setup and then save it a parallel location in user.collection
+
+MACHINE_FEATURES += "verdex"
+MACHINE_FEATURES += "iwmmxt"
+require conf/machine/include/gumstix.inc
+require conf/machine/include/tune-xscale.inc
+
+#
+# Your flash size = Total flash (in MB) - 1 (for linux kernel partition)
+ROOT_FLASH_SIZE = "15"
+#ROOT_FLASH_SIZE = "31"
+
+#
+# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1"
+#USE_VT = "0"
+USE_VT = "1"
+SYSVINIT_ENABLED_GETTYS = "1"
+
+#
+# Uncomment features that your board set supports
+
+MACHINE_FEATURES += "usbhost"
+#MACHINE_FEATURES += "usbgadget"
+
+MACHINE_FEATURES  += "i2c"
+#MACHINE_FEATURES  += "spi"
+
+MACHINE_FEATURES  += "serial"
+MACHINE_FEATURES  += "bluetooth"
+MACHINE_FEATURES  += "sound"
+
+# if you enable robostix you will need to disable both "lcd" and "touchscreen" features
+#MACHINE_FEATURES  += "robostix"
+
+MACHINE_FEATURES  += "lcd"
+MACHINE_FEATURES  += "touchscreen"
+MACHINE_FEATURES  += "keyboard"
+
+MACHINE_FEATURES  += "pcmcia"
+MACHINE_FEATURES  += "mmc"
+
+MACHINE_FEATURES  += "wifi"
+MACHINE_FEATURES  += "ethernet"
+
+MACHINE_FEATURES  += "ext2"
+MACHINE_FEATURES  += "fat"
+
+#
+# note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
+# for those features via task-base-gumstix.  Include below any extra kernel modules that you want installed
+
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx"
+
+#
+# Uncomment or add kernel modules that should be autoloaded
+
+module_autoload_proc_gpio      = 'proc_gpio'
+
+module_autoload_pcmcia         = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pcmcia', '',d)}
+module_autoload_pxa2xx_cs      = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pxa2xx_cs', '',d)}
+
+module_autoload_pxamci         = ${@base_contains('MACHINE_FEATURES', 'mmc',        'pxamci', '',d)}
+module_autoload_mmc_block      = ${@base_contains('MACHINE_FEATURES', 'mmc',        'mmc_block', '',d)}
+
+module_autoload_ethernet       = ${@base_contains('MACHINE_FEATURES', 'ethernet',   'ethernet', '',d)}
+
+module_autoload_ohci-hcd       = ${@base_contains('MACHINE_FEATURES', 'usbhost',    'ohci-hcd', '',d)}
+
+module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'gumstix_gadget', '',d)}
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_file_storage', '',d)}
+module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_ether', '',d)}
+#module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
+
+module_autoload_tsc2003        = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)}
+module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
+
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 1f29438061..e795395534 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -27,6 +27,7 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootf
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
+			      kernel-module-h5400-bt \
 			      kernel-module-snd-soc-h5000 \
 			      kernel-module-i2c-pxa"
 
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index fc5fd4e136..1bc0b2e000 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -2,47 +2,43 @@
 #@Name: Gumstix pxa2xx boards
 #@DESCRIPTION:  Gumstix pxa2xx boards
 
+# Don't edit this file unless you *really* know what you are doing!
+
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel"
 KERNEL_IMAGETYPE = "uImage"
-
-module_autoload_pxamci = "pxamci"
-module_autoload_mmc_block = "mmc_block"
-module_autoload_gumstix_gadget = "gumstix_gadget"
-module_autoload_g_ether = "g_ether"
-module_autoload_smc91x = "smc91x"
-module_autoload_smc911x = "smc911x"
+RDEPENDS_kernel-base = ""
+KERNEL_IMAGE_MAXSIZE = "1048577"
 
 UBOOT_ENTRYPOINT = "a0008000"
 
-#Assume people have some gumstix extension boards 
-MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
-
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
+MACHINE_FEATURES += "kernel26 "
+COMBINED_FEATURES ?= ""
 
-# Install all kernel modules
-#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules"
+IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids"
 
-# Install only selected kernel modules, comment out line above also
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
-                             kernel-module-rtc-core \
-                             kernel-module-rtc-dev \
-                             kernel-module-rtc-proc \
-                             kernel-module-rtc-sa1100 \
-                             kernel-module-rtc-sysfs \
-                             kernel-module-smc91x \
-                             kernel-module-gumstix-smc91x \
-                             kernel-module-smc911x \
-                             kernel-module-gumstix-smc911x \
-                             "
-
-# used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 
-#don't try to access tty1
-USE_VT = "0"
-
-require conf/machine/include/tune-xscale.inc
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS =     " \
+                                       "
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
+                                       "
+#
+# The following *should* be in a distro.conf file
+# We include them here to avoid creating a new distro
+
+PREFERRED_VERSION_gumstix-kernel = "2.6.21"
+PREFERRED_VERSION_udev = "115"
+PREFERRED_VERSION_gnuplot = "4.0.0"
+PREFERRED_VERSION_dropbear = "0.47"
+PREFERRED_VERSION_wpa-supplicant = "0.5.8"
+PREFERRED_VERSION_bluez-utils = "3.24"
+PREFERRED_VERSION_bluez-utils-alsa = "3.24"
+PREFERRED_VERSION_bluez-libs = "3.24"
+PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24"
+PREFERRED_VERSION_bluez-hcidump = "1.40"
 
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 924fb54f1e..da1e8b7557 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex"
 
 # Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}"
 
 # Add packages required for basic networking support
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index da88b1494f..a9945acd34 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -22,6 +22,7 @@ MACHINE_DISPLAY_PPI = "180"
 
 ROOT_FLASH_SIZE = "24"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 27706cbd4a..a43f621406 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -14,6 +14,8 @@ KERNEL_IMAGETYPE = "uImage"
 
 PREFERRED_VERSION_u-boot = "1.3.1"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
+UBOOT_ENTRYPOINT = "0"
+UBOOT_LOADADDRESS = "0"
 
 #rootfs on NAND flash
 EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 3ee97a447e..f95e403367 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -1,12 +1,12 @@
 #@TYPE: Machine
-#@NAME: X86
-#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
+#@NAME: Netvista J320 Internet Applicance
+#@DESCRIPTION: Machine configuration for a Linux IBM 8365 / J320 PC-based internet terminals
 
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i486"
-# TARGET_VENDOR = "-oe"
 PACKAGE_EXTRA_ARCHS = "netvista"
-PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.23"
+
 XSERVER = "xserver-kdrive-vesa"
 
 KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf
index 3dc19a4a31..ffec67b699 100644
--- a/conf/machine/omap1510inn.conf
+++ b/conf/machine/omap1510inn.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 3dc19a4a31..ffec67b699 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf
index 9a97150981..98e3a7d3e5 100644
--- a/conf/machine/omap1710h3.conf
+++ b/conf/machine/omap1710h3.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index 82be4e3f79..343b0091b5 100644
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 PREFERRED_VERSION_u-boot = "1.1.4"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf
index 39e6896b3b..0e6b646897 100644
--- a/conf/machine/omap2430sdp.conf
+++ b/conf/machine/omap2430sdp.conf
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
 PREFERRED_VERSION_u-boot = "1.1.4"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index abd50b116a..7a7b5c1a60 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -11,6 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 # PREFERRED_VERSION_u-boot = "1.1.6"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 ROOT_FLASH_SIZE = "29"
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index d7d35cfda1..3b9165d2b8 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-z"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "ttySA0 115200 vt100"
diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf
index 2dbe3ea863..0275f6b2f5 100644
--- a/conf/machine/triton.conf
+++ b/conf/machine/triton.conf
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "triton-kernel"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n"
 EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "38400 ttyS0"
diff --git a/conf/machine/xxs1500.conf b/conf/machine/xxs1500.conf
index 9cc47cdef7..4d5909126a 100644
--- a/conf/machine/xxs1500.conf
+++ b/conf/machine/xxs1500.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "mipsel"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-xxs1500"
 
+IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=0xa00000 --little-endian --eraseblock=0x20000 -n"
 
 # does not gain any speed and just creates problems: