merge of '89471c36d99620329016cb8c96d0637bd9403764'

     and 'c74c9fb96051659da0f06ac95ab8f2656055d2a9'

10 files changed, 57 insertions, 23 deletions

diff --git a/packages/angstrom/angstrom-led-config.bb b/packages/angstrom/angstrom-led-config.bb
index 6a4f26240e..12cdb96d93 100644
--- a/packages/angstrom/angstrom-led-config.bb
+++ b/packages/angstrom/angstrom-led-config.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for runtime LED configuration" 
 
 #PV = "${DISTRO_VERSION}"
-PR = "r3"
+PR = "r4"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit update-rc.d
diff --git a/packages/angstrom/angstrom-led-config/beagleboard/leds b/packages/angstrom/angstrom-led-config/beagleboard/leds
index 4a567996ee..b50fedd783 100644
--- a/packages/angstrom/angstrom-led-config/beagleboard/leds
+++ b/packages/angstrom/angstrom-led-config/beagleboard/leds
@@ -1,3 +1,3 @@
 #file format: name trigger
-beagleboard::usr0 mmc0
-beagleboard::usr1 nand-disk
+beagleboard::usr0 heartbeat
+beagleboard::usr1 mmc0
diff --git a/packages/base-passwd/base-passwd_3.5.19.bb b/packages/base-passwd/base-passwd_3.5.19.bb
index 56b677cf0f..65ee129e0b 100644
--- a/packages/base-passwd/base-passwd_3.5.19.bb
+++ b/packages/base-passwd/base-passwd_3.5.19.bb
@@ -2,8 +2,6 @@ DESCRIPTION = "Base system password/group files."
 SECTION = "base"
 LICENSE = "GPL"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
 	   file://nobash.patch;patch=1 \
 	   file://root-home.patch;patch=1 \
diff --git a/packages/linux/linux-omap/fix-install.patch b/packages/linux/linux-omap/fix-install.patch
new file mode 100644
index 0000000000..46bc25a50b
--- /dev/null
+++ b/packages/linux/linux-omap/fix-install.patch
@@ -0,0 +1,23 @@
+From: Steve Sakoman <steve@sakoman.com>
+Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700)
+Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70
+
+scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+
+This was causing build failures on some machines
+---
+
+diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
+index 6bf8e87..fb20532 100644
+--- a/scripts/Makefile.fwinst
++++ b/scripts/Makefile.fwinst
+@@ -37,7 +37,7 @@ install-all-dirs: $(installed-fw-dirs)
+ 	@true
+ 
+ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
+-      cmd_install = $(INSTALL) -m0644 $< $@
++      cmd_install = $(INSTALL) -m 0644 $< $@
+ 
+ $(installed-fw-dirs):
+ 	$(call cmd,mkdir)
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index c596a95a71..085b2f6be3 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -6,19 +6,26 @@ KERNEL_IMAGETYPE = "uImage"
 COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
 
 
-SRCREV = "b3f16ee00db9ec6b2ad53fc83fa913b42d3841be"
+SRCREV = "2a4625ebb6538f9eef5d524b8e39e5c0c1316f9a"
 
 PV = "2.6.26+2.6.27-rc5+${PR}+git${SRCREV}"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append = " file://no-harry-potter.diff;patch=1 \
-           file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
            file://timer-suppression.patch;patch=1 \
            file://no-empty-flash-warnings.patch;patch=1 \
            file://oprofile-0.9.3.armv7.diff;patch=1 \
+           file://cache-display-fix.patch;patch=1 \
+           file://4bitmmc.diff;patch=1 \
+           file://no-cortex-deadlock.patch;patch=1 \
+           file://read_die_ids.patch;patch=1 \
+           file://fix-install.patch;patch=1 \
+"
+
+temporarely-disabled = " \
            file://01-fix-timing-print.diff;patch=1 \
            file://02-set-clkseld11.diff;patch=1 \
 	   file://03-enable-overlay-opt.diff;patch=1 \
@@ -26,13 +33,9 @@ SRC_URI_append = " file://no-harry-potter.diff;patch=1 \
            file://05-fix-display-panning.diff;patch=1 \
            file://06-ensure-fclk.diff;patch=1 \
            file://07-set-burst-size.diff;patch=1 \
-           file://cache-display-fix.patch;patch=1 \
            file://mru-clocks1.diff;patch=1 \
            file://mru-clocks2.diff;patch=1 \
            file://mru-clocks3.diff;patch=1 \	
-           file://4bitmmc.diff;patch=1 \
-           file://no-cortex-deadlock.patch;patch=1 \
-           file://read_die_ids.patch;patch=1 \
            file://000-mru-make-video-mode-selcatable.diff;patch=1 \
 	   file://001-mru-enable-overlay.diff;patch=1 \
            file://002-mru-set-default-800x600.diff;patch=1 \
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 946b51b210..6311d09113 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r57"
+PR = "r58"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -165,7 +165,6 @@ SLUGOS_PACKAGES = "\
 	ncftp \
 	ncurses \
 	net-tools \
-	netatalk \
 	netcat \
 	netpbm \
 	nfs-utils \
@@ -179,7 +178,6 @@ SLUGOS_PACKAGES = "\
 	openobex-apps \
 	openntpd \
 	openobex \
-	openocd \
 	openssh \
 	openvpn \
 	patch \
@@ -262,6 +260,7 @@ SLUGOS_BROKEN_PACKAGES = "\
 	lirc-modules lirc \
 	madfu \
 	motion \
+	netatalk \
 	openldap \
 	postfix \
 	pwc \
@@ -280,7 +279,6 @@ SLUGOS_EXTRA_PACKAGES ?= ""
 DEPENDS = "\
 	slugos-image \
 	slugos-native \
-	task-nas-server-everything \
 	task-proper-tools \
 	${SLUGOS_PACKAGES} \
 	${SLUGOS_EXTRA_PACKAGES} \
diff --git a/packages/mozilla/fennec/arm/mozconfig b/packages/mozilla/fennec/arm/mozconfig
index 0e25c7e248..926fa86041 100644
--- a/packages/mozilla/fennec/arm/mozconfig
+++ b/packages/mozilla/fennec/arm/mozconfig
@@ -4,6 +4,10 @@ mk_add_options AUTOCONF=autoconf2.13
 
 ac_add_options --disable-javaxpcom
 
+ac_add_options --enable-system-cairo
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+
 ac_add_app_options xulrunner --with-arm-kuser
 ac_add_app_options xulrunner --enable-application=xulrunner
 
diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb
index cb56c949d0..cd6ccfb1db 100644
--- a/packages/mozilla/fennec_hg.bb
+++ b/packages/mozilla/fennec_hg.bb
@@ -1,9 +1,9 @@
 DEPENDS += "cairo alsa-lib "
 
 PV = "0.7"
-PR = "r2"
+PR = "r4"
 
-SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7352ef83055a \
+SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=087dfa16ea19 \
            hg://hg.mozilla.org/;module=mobile-browser;rev=767c0315369c \
            file://jsautocfg.h \
            file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 3df3f1fd03..1575b41780 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-PR = "r4"
+PR = "r5"
 
 inherit task
 
@@ -73,9 +73,16 @@ RRECOMMENDS_task-mokogateway-wifi = "\
 
 DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug"
 RDEPENDS_task-mokogateway-debug = "\
-	dfu-util \
-	openocd \
 "
+# The following packages are broken -- victims of libusb confusion.
+# These packages depend upon libusb, which provides libusb.a -- however
+# everything else depends upon libusb-compat, which also provides libusb.a
+# (this includes bluez-*, usbutils-*, hal-*, libhal-*, etc).  The wrong
+# libusb.a is staged for at least somebody.  The hacky solution right now
+# is to not build these two utils, as they are the only ones in common use
+# that DEPEND upon libusb.  This needs to be fixed in a better way, but this
+# will, at least, get the feeds working again.
+#	dfu-util \
+#	openocd \
 RRECOMMENDS_task-mokogateway-debug = "\
 "
-
diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb
index c4a2adee19..76bbfe9ca3 100644
--- a/packages/tzdata/tzdata_2007k.bb
+++ b/packages/tzdata/tzdata_2007k.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-PR = "r2"
+PR = "r3"
 
 RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
              timezone-arctic timezone-asia timezone-atlantic \
@@ -124,6 +124,7 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu     \
                 ${datadir}/zoneinfo/Asia/Bankok          \
                 ${datadir}/zoneinfo/Asia/Hong_Kong       \
                 ${datadir}/zoneinfo/Asia/Tokyo           \
+                ${datadir}/zoneinfo/Australia/Perth      \
                 ${datadir}/zoneinfo/Australia/Darwin     \
                 ${datadir}/zoneinfo/Australia/Adelaide   \
                 ${datadir}/zoneinfo/Australia/Brisbane   \