merge of 59f97700899a07187b176ccd4ee9885184f096ae

     and b1db4ad66d7affe171f6be3fc1e203540febb857

5 files changed, 7 insertions, 6 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 1f1be076c9..c80a574a0d 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -15,6 +15,7 @@ FEED_URIS += " \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
 SRCDATE = "20060425"
+SRCDATE_handhelds-pxa-2.6 = "20060506"
 
 
 # Opie
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 87ca470069..784bc5d8fd 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -41,6 +41,7 @@ ${PKGDIR}/packages/dbus/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
 ${PKGDIR}/packages/device-mapper/*.bb \
 ${PKGDIR}/packages/devlabel/*.bb \
+${PKGDIR}/packages/dhcp/*.bb \
 ${PKGDIR}/packages/didiwiki/*.bb \
 ${PKGDIR}/packages/diffstat/*.bb \
 ${PKGDIR}/packages/diffutils/*.bb \
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 126a19569c..0fc8a1ef95 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 ROOT_FLASH_SIZE = "32"
+PCMCIA_MANAGER = "pcmciautils"
 
 BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 66d3eb38ff..07753ccf64 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 #use this for a hx2xxx ipaq
 #PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
-
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 ROOT_FLASH_SIZE = "80"
@@ -21,6 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 			  -e 256KiB -p"
 
 MODUTILS = "26"	
+PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
 BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
@@ -34,7 +33,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
@@ -47,7 +45,7 @@ HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pc
                   hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
 
 
-
+module_autoload_evdev = "evdev"
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
 module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index eb44107ecd..a6439783f3 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -35,9 +35,9 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 
 USE_DEVFS = "1"
 GUI_MACHINE_CLASS = "bigscreen"
-ROOT_FLASH_SIZE = "24"
+ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
-GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop"
+GPE_EXTRA_INSTALL += "suspend-desktop"
 
 include conf/machine/include/handheld-common.conf
 include conf/machine/include/tune-strongarm.conf