merge of '2ca643ff7c613da29d4b700344b527b73f2000f6'

     and '62e4d0ce49681c6de5b9819d261c14fb44919519'

13 files changed, 23 insertions, 19 deletions

diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb
index cac16329c4..33748a005e 100644
--- a/packages/imagemagick/imagemagick_6.2.9.bb
+++ b/packages/imagemagick/imagemagick_6.2.9.bb
@@ -10,7 +10,8 @@ S = "${WORKDIR}/ImageMagick-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF="-without-x "
+EXTRA_OECONF="--without-x"
+EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl"
 
 LEAD_SONAME="libMagick.so.*"
 
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index df8a4d6222..0e034005e7 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -112,7 +112,7 @@ python () {
 # it is a bad idea to produce flash images without a valid RedBoot - that allows
 # an innocent user upgrade attempt to instantly brick the NSLU2.
 PACK_IMAGE += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
+PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}"
 
 NSLU2_SLUGIMAGE_ARGS ?= ""
 
diff --git a/packages/libschedule/libschedule_0.16.bb b/packages/libschedule/libschedule_0.16.bb
index ab71dd4521..ad8cb72712 100644
--- a/packages/libschedule/libschedule_0.16.bb
+++ b/packages/libschedule/libschedule_0.16.bb
@@ -1,15 +1,14 @@
-LICENSE = "LGPL"
-PR = "r0"
 DESCRIPTION = "RTC alarm handling library for GPE"
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-DEPENDS = "glib-2.0 sqlite"
-GPE_TARBALL_SUFFIX = "bz2"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 sqlite libgpewidget"
+PR = "r0"
 
-inherit autotools pkgconfig gpe 
+GPE_TARBALL_SUFFIX = "bz2"
 
+inherit autotools pkgconfig gpe
 
 do_stage () {
-autotools_stage_all
+        autotools_stage_all
 }
-
diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index eba9f5ef01..f2579db66f 100644
--- a/packages/linux/linux-rp_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r31"
+PR = "r32"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -48,6 +48,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/poodle_audio-r7.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
+           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://hrw-pcmcia-ids-r5.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 097eaf8470..2248f88ae0 100644
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r6"
+PR = "r7"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -34,6 +34,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            ${RPSRC}/pxafb_changeres-r2.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
+           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://hrw-pcmcia-ids-r5.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index f5af2ae05e..e8393c398f 100644
--- a/packages/linux/linux-rp_2.6.19+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -35,6 +35,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
+           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb
index 3f0472ecdd..96307e0f92 100644
--- a/packages/linux/linux-rp_2.6.19.bb
+++ b/packages/linux/linux-rp_2.6.19.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -36,6 +36,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r4.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
+           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/udev/udev-092/local.rules b/packages/udev/udev-092/local.rules
index 2308b52c4a..5b926018f5 100644
--- a/packages/udev/udev-092/local.rules
+++ b/packages/udev/udev-092/local.rules
@@ -28,4 +28,4 @@ KERNEL=="rtc0", SYMLINK+="rtc"
 ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
 
 # Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-097/local.rules b/packages/udev/udev-097/local.rules
index 2308b52c4a..5b926018f5 100644
--- a/packages/udev/udev-097/local.rules
+++ b/packages/udev/udev-097/local.rules
@@ -28,4 +28,4 @@ KERNEL=="rtc0", SYMLINK+="rtc"
 ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
 
 # Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-100/local.rules b/packages/udev/udev-100/local.rules
index 2308b52c4a..5b926018f5 100644
--- a/packages/udev/udev-100/local.rules
+++ b/packages/udev/udev-100/local.rules
@@ -28,4 +28,4 @@ KERNEL=="rtc0", SYMLINK+="rtc"
 ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
 
 # Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 1ae2c3b596..053da707c4 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES = "hotplug"
 
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index 29709c6209..436cd6fe80 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index dd956668ed..d44dd9c6a2 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \