[oe-commits] org.oe.dev linux-rp: fix previous commit, apply patches from Stanislav Brabec to akita/spitz only

[xjqian commit]

linux-rp: fix previous commit, apply patches from Stanislav Brabec to akita/spitz only
* sharpsl-rc-r1.patch interferes with tosa-keyboard-r19.patch

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 0fb5dce5f9985f387290e56c6744d389918ec4f9
ViewMTN: http://monotone.openembedded.org/revision/info/0fb5dce5f9985f387290e56c6744d389918ec4f9
Files:
1
packages/linux/linux-rp_2.6.23.bb
packages/linux/linux-rp_2.6.24.bb
Diffs:

#
# mt diff -rfaddfcf2b3197409fdb5566115c8a819dc24f124 -r0fb5dce5f9985f387290e56c6744d389918ec4f9
#
# 
# 
# patch "packages/linux/linux-rp_2.6.23.bb"
#  from [e9e6c950be869e200bd7b1f5c80ae25893151ce9]
#    to [6965363fa2cff8dd8ad9456b52eae4a5f5f5e318]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [9a26b3e970a29e9734380d092c2c24a71bd1c896]
#    to [9191ec3a826c86540d5d145050269444154acb88]
# 
============================================================
--- packages/linux/linux-rp_2.6.23.bb	e9e6c950be869e200bd7b1f5c80ae25893151ce9
+++ packages/linux/linux-rp_2.6.23.bb	6965363fa2cff8dd8ad9456b52eae4a5f5f5e318
@@ -44,9 +44,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
            ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
            ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
-           file://mtd-module.patch;patch=1;status=external \
-           file://wm8750-treble.patch;patch=1;status=external \
-           file://sharpsl-rc-r1.patch;patch=1 \
            ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
            file://hostap-monitor-mode.patch;patch=1;status=unmergable \
@@ -133,6 +130,18 @@ SRC_URI_append_tosa = "\
            "
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
+SRC_URI_append_akita = "\
+           file://sharpsl-rc-r1.patch;patch=1;status=external \
+           file://wm8750-treble.patch;patch=1;status=external \
+           file://mtd-module.patch;patch=1 \
+           "
+
+SRC_URI_append_spitz = "\
+           file://sharpsl-rc-r1.patch;patch=1;status=external \
+           file://wm8750-treble.patch;patch=1;status=external \
+           file://mtd-module.patch;patch=1 \
+           "
+
 SRC_URI_append_htcuniversal ="\
 	file://htcuni-acx.patch;patch=1;status=external \
 	"
============================================================
--- packages/linux/linux-rp_2.6.24.bb	9a26b3e970a29e9734380d092c2c24a71bd1c896
+++ packages/linux/linux-rp_2.6.24.bb	9191ec3a826c86540d5d145050269444154acb88
@@ -42,8 +42,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
            ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
            ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
            file://squashfs3.3.patch;patch=1;status=external \
-           file://mtd-module.patch;patch=1;status=external \
-           file://wm8750-treble.patch;patch=1;status=external \
            ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
            file://hostap-monitor-mode.patch;patch=1;status=unmergable \
@@ -56,7 +54,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
            file://htcuni.patch;patch=1 \
-           file://sharpsl-rc-r1.patch;patch=1 \
            file://binutils-buildid-arm.patch;patch=1 \
            file://versatile-armv6.patch;patch=1 \
            file://defconfig-c7x0 \
@@ -139,6 +136,18 @@ SRC_URI_append_tosa = "\
            "
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
+SRC_URI_append_akita = "\
+           file://mtd-module.patch;patch=1;status=external \
+           file://wm8750-treble.patch;patch=1;status=external \
+           file://sharpsl-rc-r1.patch;patch=1 \
+           "
+
+SRC_URI_append_spitz = "\
+           file://mtd-module.patch;patch=1;status=external \
+           file://wm8750-treble.patch;patch=1;status=external \
+           file://sharpsl-rc-r1.patch;patch=1 \
+           "
+
 SRC_URI_append_htcuniversal ="\
 	file://htcuni-acx.patch;patch=1;status=external \
 	"