diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 00:15:23 +0000 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 00:15:23 +0000 |
| commit | 46e9513f46b6d2b7a88025e97db4aeac190531d5 (patch) | |
| tree | 3b00a1bf7fc0a0985a2c5f43852ed15c3d6e6039 | |
| parent | d7122fb9047b66ce884bcc946c9e18213c57fa2f (diff) | |
| download | meta-opie-46e9513f46b6d2b7a88025e97db4aeac190531d5.tar.gz | |
preferred-opie-git-versions.inc: update to latest git version
* Update to latest git revision
* Remove patches merged upstream from recipes
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
| -rw-r--r-- | conf/distro/include/preferred-opie-git-versions.inc | 2 | ||||
| -rw-r--r-- | recipes-opie/libqpe/libqpe-opie_git.bb | 3 | ||||
| -rw-r--r-- | recipes-opie/opie-alarm/opie-alarm_git.bb | 5 | ||||
| -rw-r--r-- | recipes-opie/opie-taskbar/opie-taskbar_git.bb | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/conf/distro/include/preferred-opie-git-versions.inc b/conf/distro/include/preferred-opie-git-versions.inc index a15e2dd..3e17dac 100644 --- a/conf/distro/include/preferred-opie-git-versions.inc +++ b/conf/distro/include/preferred-opie-git-versions.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCREV ?= "f5c8bd6272b5bee393736f401232ce0ccc984fec" +OPIE_SRCREV ?= "6786b359962ddb914e6f81c1bae9851b976e05c2" OPIE_VERSION = "1.2.5+gitr${OPIE_SRCREV}" OPIE_GIT_PV = "${OPIE_VERSION}" diff --git a/recipes-opie/libqpe/libqpe-opie_git.bb b/recipes-opie/libqpe/libqpe-opie_git.bb index 585c0ae..8dc3c50 100644 --- a/recipes-opie/libqpe/libqpe-opie_git.bb +++ b/recipes-opie/libqpe/libqpe-opie_git.bb @@ -1,11 +1,10 @@ require ${PN}.inc PV = "${OPIE_GIT_PV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "${OPIE_GIT};protocol=git;subpath=library \ file://fix-titleheight.patch \ file://unbreak-logging-2.patch \ - file://citytime-path-2.patch \ file://no-include-pro.patch \ " diff --git a/recipes-opie/opie-alarm/opie-alarm_git.bb b/recipes-opie/opie-alarm/opie-alarm_git.bb index 6f60f4c..1fe92c4 100644 --- a/recipes-opie/opie-alarm/opie-alarm_git.bb +++ b/recipes-opie/opie-alarm/opie-alarm_git.bb @@ -1,8 +1,7 @@ require ${PN}.inc PV = "${OPIE_GIT_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/opiealarm \ - file://01opiealarm \ - file://dirdefines-2.patch " + file://01opiealarm" diff --git a/recipes-opie/opie-taskbar/opie-taskbar_git.bb b/recipes-opie/opie-taskbar/opie-taskbar_git.bb index 062ff32..d614e8f 100644 --- a/recipes-opie/opie-taskbar/opie-taskbar_git.bb +++ b/recipes-opie/opie-taskbar/opie-taskbar_git.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_GIT_PV}" -PR = "r22" +PR = "r23" SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/calibrate \ ${OPIE_GIT};protocol=git;subpath=noncore/settings/mediummount \ @@ -12,9 +12,7 @@ SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/calibrate \ file://nomax.patch;striplevel=3 \ file://no-builtin-qss-startup-2.patch \ file://kbdlocks-runtime.patch \ - file://restart-from-bindir.patch \ file://server-pro-git.patch \ - file://firstuse-path.patch \ file://force-firstuse-calibrate.patch \ " |