linux-oz-2.6: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@504 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 23 insertions, 19 deletions

diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.16.bb b/openembedded/packages/linux/linux-openzaurus_2.6.16.bb
index 0116d3098a..08a64160c1 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r37"
+PR = "r38"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -60,12 +60,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/led_sysfs_fix-r0.patch;patch=1;status=merged \
            ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1;status=merged \
            ${RPSRC}/pxaohci_pwrlimit-r0.patch;patch=1;status=merged \
+           ${RPSRC}/mmc_oops_fix-r1.patch;patch=1;status=merged \
            ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
            ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
            ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
-           ${RPSRC}/mmc_oops_fix-r0.patch;patch=1 \
-           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
-           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
+           ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
+           file://00-hostap.patch;patch=1;status=pending \
+           file://10-pcnet.patch;patch=1;status=pending \
            ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
            ${RPSRC}/asoc_fixups-r0.patch;patch=1 \
            ${RPSRC}/hx2750_base-r24.patch;patch=1 \
@@ -76,32 +77,32 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/hx2750_test1-r3.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
-           ${RPSRC}/jffs2_longfilename-r1.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
-           ${RPSRC}/collie_frontlight-r1.patch;patch=1 \
-           ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \
+           ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \
+           ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
            ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
-           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
-           ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \
-           ${RPSRC}/integrator_rgb-r0.patch;patch=1 \
-           ${RPSRC}/logo_oh-r0.patch.bz2;patch=1 \
-           ${RPSRC}/logo_oz-r1.patch.bz2;patch=1 \
-           file://add-oz-release-string.patch;patch=1 \
-           file://pxa-serial-hack.patch;patch=1 \
-           ${RPSRC}/pxa-linking-bug.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://connectplus-remove-ide-HACK.patch;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
-           file://00-hostap.patch;patch=1 \
            file://locomo-kbd-hotkeys.patch;patch=1 \
            file://locomo-sysrq+keyrepeat.patch;patch=1 \
            file://locomo-lcd-def-bightness.patch;patch=1 \
-           file://squashfs3.0-2.6.15.patch;patch=1 \
+           ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
+           ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
+           ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
+           file://add-oz-release-string.patch;patch=1;status=unmergable \
+           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
+           ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \
+           ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
+           ${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \
+           file://pxa-serial-hack.patch;patch=1;status=hack \
+           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
+           file://squashfs3.0-2.6.15.patch;patch=1;status=external \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \
@@ -111,6 +112,9 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            file://defconfig-qemuarm \
            file://defconfig-tosa "
 
+# Add this to enable pm debug code (useful with a serial lead)
+#  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1
+
 # Disabled until I find the reason this gives issues with cdc_subset
 #            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \