[oe-commits] org.oe.dev merge of '93692aaac63b82b355275bee987480a1232079a1'

[oe commit]

merge of '93692aaac63b82b355275bee987480a1232079a1'
     and 'ffd5dadc681850a711352c103d0f1547e77207ca'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 501fa938422c98da06cd4133211f6e771f97716f
ViewMTN: http://monotone.openembedded.org/revision/info/501fa938422c98da06cd4133211f6e771f97716f
Files:
1
packages/linux/linux-rp_2.6.23.bb
packages/uicmoc/uicmoc-native_2.3.10.bb
Diffs:

#
# mt diff -r93692aaac63b82b355275bee987480a1232079a1 -r501fa938422c98da06cd4133211f6e771f97716f
#
# 
# 
# patch "packages/linux/linux-rp_2.6.23.bb"
#  from [5d7d03fa911c5c9239bbe6af4d43a4bdbdfea39e]
#    to [cae2b6640f80fb88e382ef42fd697c013b99999d]
# 
============================================================
--- packages/linux/linux-rp_2.6.23.bb	5d7d03fa911c5c9239bbe6af4d43a4bdbdfea39e
+++ packages/linux/linux-rp_2.6.23.bb	cae2b6640f80fb88e382ef42fd697c013b99999d
@@ -1,10 +1,7 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r19"
+PR = "r20"
 
-DEFAULT_PREFERENCE_qemuarm = "-1"
-DEFAULT_PREFERENCE_qemux86 = "-1"
-
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
@@ -43,7 +40,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
            ${RPSRC}/export_atags-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1 \
            ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
-           ${RPSRC}/poodle_asoc_fix-r0.patch;patch=1 \
+           ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
            ${RPSRC}/locomo_led_fix-r0.patch;patch=1 \
            file://w100fb-unused-var.patch;patch=1 \
            file://hostap-monitor-mode.patch;patch=1 \


#
# mt diff -rffd5dadc681850a711352c103d0f1547e77207ca -r501fa938422c98da06cd4133211f6e771f97716f
#
# 
# 
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
#  from [d343168478c8c6e8b0748587327fb181ecea6164]
#    to [8a850c5f5a76de24230400e87207f65d561566dc]
# 
============================================================
--- packages/uicmoc/uicmoc-native_2.3.10.bb	d343168478c8c6e8b0748587327fb181ecea6164
+++ packages/uicmoc/uicmoc-native_2.3.10.bb	8a850c5f5a76de24230400e87207f65d561566dc
@@ -7,7 +7,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
            file://fix-makefile.patch;patch=1 \
-           file://gcc3_4.patch;patch=1" \
+           file://gcc3_4.patch;patch=1 \
            file://gcc4.patch;patch=1 \
            file://gcc4_1.patch;patch=1 \
            file://64bit-cleanup.patch;patch=1 \