summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-22 13:43:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-23 13:00:43 +0100
commit9d734f4b3010586ffd44b631ecb03b87b9d48a38 (patch)
treef4c619377934c4e6a5843f0e3a8cc0244f72c2db
parent361d686408b9a0b2ab2f1caf2b74adfe1ad1020c (diff)
downloadpoky-9d734f4b3010586ffd44b631ecb03b87b9d48a38.tar.gz
matchbox-session-sato: install GConf values directly instead of using schemas
Because both matchbox-session-sato and settings-daemon were attempting to install their preferred values though schemas there was a race as to which ones were used. Revert matchbox-session-sato back to writing the values directly, adding a dependency on gconf-native so that this can happen on the host. (From OE-Core rev: 90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas53
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb21
2 files changed, 13 insertions, 61 deletions
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas
deleted file mode 100644
index f5b770b62f..0000000000
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas
+++ /dev/null
@@ -1,53 +0,0 @@
1<?xml version="1.0"?>
2<gconfschemafile>
3<schemalist>
4
5 <schema>
6 <key>/schemas/desktop/poky/interface/theme</key>
7 <applyto>/desktop/poky/interface/theme</applyto>
8 <type>string</type>
9 <owner>matchbox-session-sato</owner>
10 <default>Sato</default>
11 <locale name="C">
12 <short>Desktop theme</short>
13 <long>The theme name for Matchbox and Sato to use.</long>
14 </locale>
15 </schema>
16
17 <schema>
18 <key>/schemas/desktop/poky/interface/icon_theme</key>
19 <applyto>/desktop/poky/interface/icon_theme</applyto>
20 <type>string</type>
21 <owner>matchbox-session-sato</owner>
22 <default>Sato</default>
23 <locale name="C">
24 <short>Desktop icon theme</short>
25 <long>The icon theme name for Matchbox and Sato.</long>
26 </locale>
27 </schema>
28
29 <schema>
30 <key>/schemas/desktop/poky/interface/touchscreen</key>
31 <applyto>/desktop/poky/interface/touchscreen</applyto>
32 <type>bool</type>
33 <owner>matchbox-session-sato</owner>
34 <default>true</default>
35 <locale name="C">
36 <short>Activate touchscreen</short>
37 </locale>
38 </schema>
39
40 <schema>
41 <key>/schemas/desktop/poky/interface/font_name</key>
42 <applyto>/desktop/poky/interface/font_name</applyto>
43 <type>string</type>
44 <owner>matchbox-session-sato</owner>
45 <default>Sans 9</default>
46 <locale name="C">
47 <short>Font name</short>
48 </locale>
49 </schema>
50
51</schemalist>
52</gconfschemafile>
53
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index 70cf7a90d5..2d18c66f18 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -6,16 +6,15 @@ LICENSE = "GPLv2.0+"
6LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" 6LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"
7 7
8SECTION = "x11" 8SECTION = "x11"
9RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session" 9DEPENDS = "gconf-native"
10RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf"
10PR = "r30" 11PR = "r30"
11 12
12# This package is architecture specific because the session script is modified 13# This package is architecture specific because the session script is modified
13# based on the machine architecture. 14# based on the machine architecture.
14PACKAGE_ARCH = "${MACHINE_ARCH}" 15PACKAGE_ARCH = "${MACHINE_ARCH}"
15 16
16SRC_URI = "file://session \ 17SRC_URI = "file://session"
17 file://matchbox-session-sato.schemas \
18 "
19S = "${WORKDIR}" 18S = "${WORKDIR}"
20 19
21do_install() { 20do_install() {
@@ -33,9 +32,15 @@ do_install() {
33 install -d ${D}/${sysconfdir}/matchbox 32 install -d ${D}/${sysconfdir}/matchbox
34 sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session 33 sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session
35 chmod +x ${D}/${sysconfdir}/matchbox/session 34 chmod +x ${D}/${sysconfdir}/matchbox/session
36
37 install -d ${D}/${sysconfdir}/gconf/schemas
38 install -m 664 ${S}/matchbox-session-sato.schemas ${D}/${sysconfdir}/gconf/schemas
39} 35}
40 36
41inherit gconf 37pkg_postinst_${PN} () {
38 set_value() {
39 #type, name, value
40 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3"
41 }
42 set_value string theme Sato
43 set_value string icon_theme Sato
44 set_value bool touchscreen true
45 set_value string font_name "Sans 9"
46}