18 files changed, 194 insertions, 50 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 0f7e82ef43..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}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f46c954636..ca1227a84e 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"
@@ -118,12 +119,12 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
-SRCREV_pn-opkg ?= "4019"
+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-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
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/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..af64a31d8b 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"
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/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/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"