summaryrefslogtreecommitdiff
path: root/packages/openmoko2/openmoko-today2-folders_svn.bb
diff options
context:
space:
mode:
Diffstat (limited to 'packages/openmoko2/openmoko-today2-folders_svn.bb')
-rw-r--r--packages/openmoko2/openmoko-today2-folders_svn.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
index ecd28d1b68..4f72ac9a94 100644
--- a/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,7 +1,9 @@
DESCRIPTION = "The OpenMoko Today2 vfolder files"
SECTION = "openmoko/misc"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
+RCONFLICTS_${PN} = "matchbox-common"
+RREPLACES_${PN} = "matchbox-common"
inherit openmoko2