[oe-commits] org.oe.dev openmoko-session2: honour ${sysconfdir} instead of hardcoding /etc and mark matchbox-session as conffile since #$()*&@$*(&#@( ipkg keeps overwriting mine on my a780

[koen commit]

openmoko-session2: honour ${sysconfdir} instead of hardcoding /etc and mark matchbox-session as conffile since #$()*&@$*(&#@( ipkg keeps overwriting mine on my a780

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 07740531bf44a83c2213a94450abc8aaa64ce3a3
ViewMTN: http://monotone.openembedded.org/revision/info/07740531bf44a83c2213a94450abc8aaa64ce3a3
Files:
1
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -ra740b472f262cd7f325c3e5fc6041e47231ef7da -r07740531bf44a83c2213a94450abc8aaa64ce3a3
#
# 
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [2f8ec02e7147e7aad394dad1204d210e52626bc8]
#    to [496842695053a5e4f7cd66d4e569a3903302e8ae]
# 
============================================================
--- packages/openmoko2/openmoko-session2.bb	2f8ec02e7147e7aad394dad1204d210e52626bc8
+++ packages/openmoko2/openmoko-session2.bb	496842695053a5e4f7cd66d4e569a3903302e8ae
@@ -1,19 +1,20 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r32"
+PR = "r33"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
 
 do_install() {
-	cp -R ${S}/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/matchbox/.svn
-	chmod -R 755 ${D}/etc
+        install -d ${D}${sysconfdir}
+	cp -R ${S}/etc/* ${D}${sysconfdir}
+	rm -fR ${D}${sysconfdir}/.svn
+	rm -fR ${D}${sysconfdir}/matchbox/.svn
+	chmod -R 755 ${D}${sysconfdir}/
 }
 
 pkg_postinst_openmoko-session2 () {
@@ -31,3 +32,6 @@ PACKAGE_ARCH = "all"
 }
 
 PACKAGE_ARCH = "all"
+
+CONFFILES_${PN} = "${sysconfdir}/matchbox/session"
+