[oe-commits] org.oe.dev openmoko-session2: don't ship $bindir/matchbox-session, rather depend on matchbox-common

[mickeyl commit]

openmoko-session2: don't ship $bindir/matchbox-session, rather depend on matchbox-common

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d7806a43c44175ea7383681c5d772583a85125e1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d7806a43c44175ea7383681c5d772583a85125e1
Files:
1
packages/openmoko2/openmoko-session2/matchbox-session
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r913db9a34920c5a814b9583b8c0219c80bc8ac63 -rd7806a43c44175ea7383681c5d772583a85125e1
#
# 
# 
# delete "packages/openmoko2/openmoko-session2/matchbox-session"
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c]
#    to [7c81f0e781a68599e298fc496262f301aea8872d]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c
+++ packages/openmoko2/openmoko-session2.bb	7c81f0e781a68599e298fc496262f301aea8872d
@@ -1,16 +1,14 @@ SECTION = "x11"
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-RCONFLICTS = "matchbox-common openmoko-session"
-PR = "r20"
+RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "openmoko-session"
+PR = "r21"
 
 SRC_URI = "file://etc file://matchbox-session"
 S = ${WORKDIR}
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 ${S}/matchbox-session ${D}/${bindir}
 	cp -R ${S}/etc ${D}/etc
 	rm -fR ${D}/etc/.svn
 	rm -fR ${D}/etc/matchbox/.svn