summaryrefslogtreecommitdiffstats
path: root/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-05-23 14:10:08 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-05-23 14:10:08 +0000
commit56bd25c1cac0d0b433c3b2b5b4e075319b4aa324 (patch)
tree9ce3944acd48cd1bca09e0e422d71d6ef8e63c6e /meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
parentfb8af86c44daed3714b0ee1c611c74a736b0823d (diff)
downloadpoky-56bd25c1cac0d0b433c3b2b5b4e075319b4aa324.tar.gz
openmoko: merge with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4552 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb')
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
index ecd28d1b68..4b9f245c3c 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,7 +1,8 @@
1DESCRIPTION = "The OpenMoko Today2 vfolder files" 1DESCRIPTION = "The Openmoko Today2 vfolder files"
2SECTION = "openmoko/misc" 2SECTION = "openmoko/misc"
3PV = "0.1.0+svnr${SRCREV}" 3PV = "0.1.0+svnr${SRCREV}"
4PR = "r1" 4PR = "r3"
5RCONFLICTS_${PN} = "matchbox-common"
5 6
6inherit openmoko2 7inherit openmoko2
7 8