merge of '0fee5c6e2897d294c4895897736141bed93199a1'

     and '113954a10c1eecc2f688fdb881e40dcd951cf598'

4 files changed, 25 insertions, 32 deletions

diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 8203c000f7..9c2679aff1 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -9,7 +9,7 @@ DISTRO_NAME = "Angstrom"
 ANGSTROM_URI = "http://www.angstrom-distribution.org"
 
 #Set the default maintainer to angstrom-dev
-MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
+MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>"
 
 #use ipkg package format with debian style naming
 #use multimachine buildrules 
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index dbc7b3ad41..fc432afecb 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -29,20 +29,24 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
 #<>We want kdrive as our default X-Server.
 #<>
 PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
-PREFERRED_PROVIDERS_virtual/xserver += "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver  = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/libx11    = "libx11"
+
 
 #<>
 #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
 #<>
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
+PREFERRED_VERSION_binutils = "2.17"
+PREFERRED_VERSION_binutils-cross = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7"
 PREFERRED_VERSION_gcc = "4.1.1"
 PREFERRED_VERSION_gcc-cross = "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
 PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"                                             		    
 PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 PREFERRED_VERSION_glibc-initial = "2.3.2"
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+
 
 #<>
 #<>Setting Preferred glib-2.0,glib-1.2
@@ -56,7 +60,6 @@ PREFERRED_VERSION_glib-1.2 = "1.2.10"
 #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
 #<>
 PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
-PREFERRED_PROVIDER_virtual/libx11        = "x11"
 PREFERRED_PROVIDER_tslib         = "tslib"
 PREFRRED_VERSION_cairo           = "1.0.4"
 #<>
diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf
index f10e89ce89..b8592fdf68 100644
--- a/conf/distro/maemo-1.0.conf
+++ b/conf/distro/maemo-1.0.conf
@@ -8,9 +8,7 @@ DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 
 FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
-
+		"
 #SRCDATE = 20050331
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 8ce77e7449..dac9a84aff 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -1,22 +1,27 @@
 #@TYPE: Machine
 #@NAME: HTC Universal
-#@DESCRIPTION: Machine configuration for the HTC Universal with a pxa27x CPU  devices
+#@DESCRIPTION: Machine configuration for the HTC Universal
 
 TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa htcuniversal"
+IPKG_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt"
+
 #use this for a HTC Universal
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-#PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-un-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+XSERVER = "xserver-kdrive-fbdev"
 
 MODUTILS = "26"	
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
-#BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
+BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
 
-PXA270_MODULES = "g_ether hidp i2c-core i2c-pxa i2c-sensor"
+PXA270_MODULES = "acx g_ether g_file_storage pxa27x_udc bsd_comp \
+                  snd_pcm_oss snd_mixer_oss \
+                  hidp bluetooth bfusb hci_usb \
+                  irtty-sir pxaficp_ir sir-dev \
+		  "	
 
 include conf/machine/include/smartphone-common.conf
 
@@ -28,23 +33,10 @@ include conf/machine/include/tune-xscale.conf
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
 #include conf/machine/include/tune-iwmmxt.conf
 
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}"
-UN_MODULES = " htcuniversal_acx acx"
-
+UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio"
 
-#module_autoload_htcuniversal_power = "htcuniversal_power"
-#module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal"
-#module_autoload_snd-pcm-oss = "snd-pcm-oss"
-#module_autoload_snd-mixer-oss = "snd-mixer-oss"
-#module_autoload_firmware-class = "firmware-class"
 module_autoload_acx = "acx"
-module_autoload_htcuniversal-acx = "htcuniversal_acx"
-#module_autoload_htcuniversal-bt = "htcuniversal_bt"
-#module_autoload_htcuniversal-power = "htcuniversal_power"
-
-#module_autoload_pxa27x_udc = "pxa27x_udc"
+module_autoload_htcuniversal_acx = "htcuniversal_acx"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
-
-#GPE_EXTRA_INSTALL += " gomunicator"