summaryrefslogtreecommitdiff
path: root/packages/openmoko2
diff options
context:
space:
mode:
Diffstat (limited to 'packages/openmoko2')
-rw-r--r--packages/openmoko2/openmoko-session2.bb3
-rw-r--r--packages/openmoko2/openmoko-today2-folders_svn.bb3
2 files changed, 2 insertions, 4 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 2b18870aec..6a33e62c42 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,8 +4,7 @@ SECTION = "x11"
RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-RREPLACES_${PN} = "matchbox-common"
-PR = "r40"
+PR = "r41"
SRC_URI = "\
file://etc \
diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb
index 4f72ac9a94..baf60d877b 100644
--- a/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,9 +1,8 @@
DESCRIPTION = "The OpenMoko Today2 vfolder files"
SECTION = "openmoko/misc"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
RCONFLICTS_${PN} = "matchbox-common"
-RREPLACES_${PN} = "matchbox-common"
inherit openmoko2