diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-09-21 17:34:01 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-21 17:34:01 +0000 |
| commit | 421dab1d4021b25b794e3820ac87fbabf6930330 (patch) | |
| tree | 27754de6a5b7ec1d893b6bfeebe37e3f3e600794 | |
| parent | a2bd92b758b1d686610328ca35f263d4bd7c4fdc (diff) | |
openmoko-session2: honour ${sysconfdir} instead of hardcoding /etc and mark matchbox-session as conffile since #$()*&@$*(&#@( ipkg keeps overwriting mine on my a780
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 235ca6ad97..b1f9dae38d 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,16 +4,17 @@ 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 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire } PACKAGE_ARCH = "all" + +CONFFILES_${PN} = "${sysconfdir}/matchbox/session" + |