8 files changed, 151 insertions, 26 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 048857b8fa..0aeabe4f15 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -193,12 +193,10 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps"
 # Angstrom want to ship some extra stuff. This should be moved into task-base eventually
 # contains ipkg specific stuff as well :(
 DISTRO_EXTRA_RDEPENDS += "\
-    update-modules \
-    ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
     ${ANGSTROM_FEED_CONFIGS} \
     util-linux-ng-mount util-linux-ng-umount \
-    ${DEBUG_APPS} angstrom-libc-fixup-hack \
+    angstrom-libc-fixup-hack \
     "
 
 DISTRO_EXTRA_RRECOMMENDS += " \
@@ -209,7 +207,9 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     avahi-daemon \
     avahi-autoipd \
     openssh-sftp-server \
-    "
+    ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)} \
+    ${DEBUG_APPS} \
+"
 
 SEPPUKU_NEWREPORT    = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index ff6aa1f6a3..e0757a7abd 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -18,6 +18,9 @@ DISTRO_VERSION = "test-${DATE}"
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 
+# Needed for e.g. libffi builds on armv6
+OVERRIDES .= ":${FEED_ARCH}"
+
 require conf/distro/include/angstrom-glibc.inc
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1"
 
@@ -57,7 +60,7 @@ PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 
-PREFERRED_VERSION_automake-native = "1.9.6"
+PREFERRED_VERSION_automake-native = "1.10"
 
 PREFERRED_VERSION_binutils = "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross    = "2.18"
@@ -98,7 +101,7 @@ PREFERRED_VERSION_gnome-vfs        = "2.16.3"
 
 # 3.9.1 would be correct
 PREFERRED_VERSION_gtkhtml-3.8      = "3.8.2"
-PREFERRED_VERSION_libxml2          = "2.6.27"
+PREFERRED_VERSION_libxml2          = "2.7.2"
 # 2.16 would be correct
 PREFERRED_VERSION_gconf            = "2.6.1"
 
@@ -172,6 +175,8 @@ PREFERRED_VERSION_hildon-thumbnail = "0.14"
 PREFERRED_VERSION_osso-gwconnect = "1.0.12"
 PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
 
+PREFERRED_VERSION_shared-mime-info = "0.22"
+
 # Java stuff 
 PREFERRED_PROVIDER_midpath = "midpath-maemo"
 PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 34fbc52cfe..5675e75723 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -230,8 +230,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-vfat \
     kernel-module-ext2 \
     kernel-module-af-packet \
-    avahi-daemon \
-    avahi-autoipd \
     openssh-sftp-server \
     "
 
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 944fbfa47d..9f4229f224 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -281,7 +281,7 @@ PREFERRED_VERSION_dvb-image ?= "1.0"
 PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
 PREFERRED_VERSION_dviviewer ?= "1.0.2"
 PREFERRED_VERSION_e2fsprogs ?= "1.38"
-PREFERRED_VERSION_e2fsprogs-libs ?= "1.39"
+PREFERRED_VERSION_e2fsprogs-libs ?= "1.42.2"
 PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.35"
 PREFERRED_VERSION_e2fsprogs-native ?= "1.38"
 PREFERRED_VERSION_e2tools ?= "0.0.16"
@@ -1375,8 +1375,8 @@ PREFERRED_VERSION_openprotium-packages ?= "1.0"
 PREFERRED_VERSION_opensp ?= "1.5"
 PREFERRED_VERSION_opensp-native ?= "1.5"
 PREFERRED_VERSION_openssh ?= "4.6p1"
-PREFERRED_VERSION_openssl ?= "0.9.7g"
-PREFERRED_VERSION_openssl-native ?= "0.9.7g"
+PREFERRED_VERSION_openssl ?= "0.9.8j"
+PREFERRED_VERSION_openssl-native ?= "0.9.8j"
 PREFERRED_VERSION_openswan ?= "2.4.7"
 PREFERRED_VERSION_openttd ?= "0.6.3"
 PREFERRED_VERSION_openvpn ?= "2.0.9"
@@ -1422,7 +1422,7 @@ PREFERRED_VERSION_pax-utils ?= "0.1.13"
 PREFERRED_VERSION_pax-utils-native ?= "0.1.13"
 PREFERRED_VERSION_pbltool-native ?= "0.2"
 PREFERRED_VERSION_pciutils ?= "2.2.4"
-PREFERRED_VERSION_pcmanfm ?= "0.3.2-beta"
+PREFERRED_VERSION_pcmanfm ?= "0.5"
 PREFERRED_VERSION_pcmcia-cs ?= "3.2.8"
 PREFERRED_VERSION_pcmciautils ?= "014"
 PREFERRED_VERSION_pdamaze ?= "1.0.0"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index fb6aa58566..a2fffdf88d 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -51,7 +51,7 @@ SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
 # Misc packages, sorted by alphabet
-SRCDATE_aufs ?= "20080826"
+SRCDATE_aufs ?= "20081203"
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
 SRCDATE_dvbstream ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 876c857f40..d25bd9e738 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -54,6 +54,8 @@ SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-gpsd ?= "15f75f335efb52dd50a22a05f47a0f63eb07378b"
+SRCREV_pn-fso-gsm0710muxd ?= "95151f9e2fe37e0989b981027deefa3821a3b4e5"
+SRCREV_pn-fso-monitord ?= "31b4d3d1a40b1cc2cbe186e5ea80490a0c80b55f"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
@@ -61,7 +63,6 @@ SRCREV_pn-gnuradio ?= "9809"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-sketchbook ?= "9547"
 SRCREV_pn-gpe-conf ?= "9798"
-SRCREV_pn-gsm0710muxd ?= "95151f9e2fe37e0989b981027deefa3821a3b4e5"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
@@ -112,7 +113,7 @@ SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "27659"
+SRCREV_pn-mplayer ?= "28311"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multicat ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-multitap-pad ?= "373"
@@ -220,7 +221,7 @@ SRCREV_pn-uclibc-initial ?= "24279"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
-SRCREV_pn-webkit-gtk ?= "36540"
+SRCREV_pn-webkit-gtk ?= "39964"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wlan-ng-modules ?= "1859"
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf
new file mode 100644
index 0000000000..a72988ea76
--- /dev/null
+++ b/conf/distro/jlime-2009.1.conf
@@ -0,0 +1,108 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Jlime 2009.1 <jlime.com>
+#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
+#              HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c.
+#@MAINTAINER: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
+#-----------------------------------------------------------------------------
+
+#
+# Header
+#
+DISTRO_NAME = "Jlime"
+DISTRO_VERSION = "2009.1"
+#DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
+
+export FEED_URLS_jlime = "http://repository.jlime.com/"
+
+#<>------------------------------------------------------------------>
+#<>What we want on the bootstrap image (extra) 
+#<>                                            
+#<>------------------------------------------------------------------<
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
+			console-tools tslib-tests parted dialog"
+
+#<>------------------------------------------------------------------>
+#<>Our Image files should look abit better.
+#<>
+#<>------------------------------------------------------------------<
+IMAGE_NAME = "${IMAGE_BASENAME}-2009.1-${MACHINE}"
+
+#
+# Naming schemes
+#
+INHERIT += "debian"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+INHERIT += "package_tar"
+IMAGE_FSTYPES = "tar.bz2"
+
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#
+# Binutils & Compiler
+#
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_gcc = "4.2.2"
+PREFERRED_VERSION_gcc-cross = "4.2.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
+PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
+PREFERRED_VERSION_binutils = "2.18"
+PREFERRED_VERSION_binutils-cross = "2.18"
+
+#
+# Target OS & FPU system
+# 
+TARGET_OS = "linux"
+TARGET_FPU_arm = "soft"
+TARGET_FPU_armeb = "soft"
+
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc"
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+PREFERRED_VERSION_glibc = "2.5"
+
+#
+# Bootstrap & Init
+#
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#
+# Framebuffer & X
+#
+PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#
+# GPE
+#
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+OPIE_VERSION = "1.2.3"
+require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 7e7aa1d022..bd58356f21 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -30,6 +30,19 @@ DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
 AB_DEPLOY_EXTRA ?= ""
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
 
+DISTRO_INITSCRIPTS = "initscripts-openmoko"
+
+# We try to minimize the distro features in the default image.
+DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
+
+# Some features (bluetooth, usbgadget) include packages we do not like.
+# Pick some of the packages manually.
+DISTRO_EXTRA_RDEPENDS += " \
+    bluez-utils \
+    bluez-utils-compat \
+    kernel-module-g-ether \
+    "
+
 # 2.18 seems to break badly on 64-bit systems
 PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
@@ -46,20 +59,20 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
 # Same kernel used to run on both these machines...
 # Currently not used but left here in case someone wants to switch on
 # quickly
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "armv4t"
 
 # Same kernel so same usb
-PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
 # same kernel so same keymaps
-PACKAGE_ARCH_pn-keymaps_om-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-keymaps_om-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
 # neod knows about both machines
-PACKAGE_ARCH_pn-neod_om-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-neod_om-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
 
 # Select package versions we want to use.
 PREFERRED_PROVIDER_gtk+ = "gtk+"