diff options
| -rw-r--r-- | packages/linux/linux-omap_git.bb | 6 | ||||
| -rw-r--r-- | packages/opie-bluetoothmanager/opie-bluetoothmanager.inc | 4 | ||||
| -rw-r--r-- | packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index a09e8f96d4..7107c1b5ba 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -6,10 +6,10 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm" -SRCREV = "74fcfe9c589f1060b5e5a791e9c0c54212d7c1b8" +SRCREV = "de1121fdb899f762" PV = "2.6.26+2.6.27-rc6+${PR}+git${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -24,7 +24,6 @@ SRC_URI_append = " \ file://musb-dma-iso-in.eml;patch=1 \ file://musb-support-high-bandwidth.patch.eml;patch=1 \ file://musb-mru-otgfix.diff;patch=1 \ - file://16bpp.patch;patch=1 \ file://01-fix-timing-print.diff;patch=1 \ file://03-enable-overlay-opt.diff;patch=1 \ file://05-fix-display-panning.diff;patch=1 \ @@ -54,7 +53,6 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ " SRC_URI_append_omap3evm = " \ - file://touchscreen.patch;patch=1 \ " S = "${WORKDIR}/git" diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc index 30acc59f10..84d737b527 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc @@ -13,8 +13,10 @@ EXTRA_QMAKEVARS_PRE += "LIBOBEXFTP_INC_DIR=${STAGING_INCDIR}/obexftp" inherit opie -# Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/* +# Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/* pics/opietooth/icons/* do_install() { install -d ${D}${palmtopdir}/pics/opietooth/ + install -d ${D}${palmtopdir}/pics/opietooth/icons/ install -m 0644 ${WORKDIR}/pics/opietooth/*.png ${D}${palmtopdir}/pics/opietooth/ + install -m 0644 ${WORKDIR}/pics/opietooth/icons/*.png ${D}${palmtopdir}/pics/opietooth/icons/ } diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb index 6a27b53101..2eb719fbfc 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.3.bb @@ -1,5 +1,7 @@ require ${PN}.inc +PR = "r1" + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" |