diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-09-24 11:09:51 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-09-24 11:09:51 +0200 |
| commit | 6d1554ecf044484e5e21e34f4b9700e07562cf64 (patch) | |
| tree | ec959852c378b77afdc514f143e423b27d369073 /recipes/linux | |
| parent | 7e550c41844a776407b6bbdeca06c52f155b317d (diff) | |
| parent | 2455668c3a182ba3bf7bdbd4f94b940b1f978f03 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-omap-zoomsync_2.6.31.bb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/recipes/linux/linux-omap-zoomsync_2.6.31.bb b/recipes/linux/linux-omap-zoomsync_2.6.31.bb index 63f9462633..04490af6dd 100644 --- a/recipes/linux/linux-omap-zoomsync_2.6.31.bb +++ b/recipes/linux/linux-omap-zoomsync_2.6.31.bb @@ -8,13 +8,17 @@ COMPATIBLE_MACHINE = "omapzoom2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_omapzoom2 = "1" -SRCREV = "3823238fe2e56f60b9c6c085d3f1cfa720ae89b8" +LOBRANCH?= "master" + +SRCREV = "02b2ce47a93e32f3b4e26662d78a0f31a6ac37ab" +OEV = "oe1" +PE = "1" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -PV = "2.6.30+2.6.31-rc7" +PV = "2.6.30+2.6.31-rc7-${OEV}" PR_append = "+gitr${SRCREV}" -SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=lo-sync-v2.6.31-rc7-7a8d53a0;protocol=git \ +SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=${LOBRANCH};protocol=git \ file://defconfig" SRC_URI_append = " \ |