diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-09 22:48:49 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-09 22:48:49 +0000 |
| commit | da8b925e65f4fd85dea06aa0355e7a443671e682 (patch) | |
| tree | cb9429b740244099f3de47d85c1bbff1217512c6 | |
| parent | 48941e3a7b5c95e06e6f7504660893e3f1f5c445 (diff) | |
| parent | 37bc40217934d8490498f85a93594925ad608c37 (diff) | |
merge of '2fce1b18b908ec5929c213cc29050175502a72a6'
and 'a42c91c4ca9edb328881ae31da2dbdb01a976e1e'
| -rw-r--r-- | packages/libopie/libopie2/ipaq_rotate_fix.patch | 23 | ||||
| -rw-r--r-- | packages/linux/linux-kaiser_2.6.24+git.bb | 7 | ||||
| -rw-r--r-- | packages/linux/linux.inc | 9 |
3 files changed, 36 insertions, 3 deletions
diff --git a/packages/libopie/libopie2/ipaq_rotate_fix.patch b/packages/libopie/libopie2/ipaq_rotate_fix.patch new file mode 100644 index 0000000000..9dfdb4fbf7 --- /dev/null +++ b/packages/libopie/libopie2/ipaq_rotate_fix.patch @@ -0,0 +1,23 @@ +--- libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:01.000000000 +0100 ++++ libopie2/opiecore/device/odevice_ipaq.cpp 2008-05-26 16:33:40.000000000 +0100 +@@ -331,16 +331,10 @@ + case Key_Down : { + int quarters; + switch (d->m_rotation) { +- case Rot0: quarters = 3/*270deg*/; break; +- case Rot90: quarters = 2/*270deg*/; break; +- case Rot180: quarters = 1/*270deg*/; break; +- case Rot270: quarters = 0/*270deg*/; break; +- } +- if( d->m_model == Model_iPAQ_H22xx ) { +- // FIXME: there's something screwed with the keycodes being sent on h2200. I have +- // added a temporary workaround for this here, but the bug should be fixed properly +- // later in the right place. - Paul Eggleton 25/07/2007 +- quarters = 0; ++ case Rot0: quarters = 0/*0deg*/; break; ++ case Rot90: quarters = 1/*90deg*/; break; ++ case Rot180: quarters = 2/*180deg*/; break; ++ case Rot270: quarters = 3/*270deg*/; break; + } + newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; + break; diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb index ba4e6c1973..758cbdcc0b 100644 --- a/packages/linux/linux-kaiser_2.6.24+git.bb +++ b/packages/linux/linux-kaiser_2.6.24+git.bb @@ -1,15 +1,16 @@ require linux.inc PV = "2.6.24+git${SRCREV}" +PR = "r1" COMPATIBLE_MACHINE = "htckaiser" -SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \ - http://baliniak.pl/android/kernel.diff;patch=1" +SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git" S = "${WORKDIR}/git" do_configure_prepend() { - cp .config ../defconfig + cp arch/arm/configs/htckaiser_defconfig ../defconfig } + diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 679f73a7f4..a6bffe728a 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -142,3 +142,12 @@ do_devicetree_image() { } addtask devicetree_image after do_deploy before do_package + +pkg_postinst_kernel-devicetree () { + cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree devicetree devicetree-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true +} + +pkg_postrm_kernel-devicetree () { + cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true +} + |