diff options
author | Richard Purdie <richard@openedhand.com> | 2008-09-04 11:34:26 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-09-04 11:34:26 +0000 |
commit | 9a90cab4761addf35222e0210943fc16c3a15a30 (patch) | |
tree | 8be9dbd76067ee4f8b4051ce2a06e97a709ba69a /meta/classes | |
parent | 15e4284e092ada6ca7d96ad44a0b3c5d9fb04866 (diff) | |
download | poky-9a90cab4761addf35222e0210943fc16c3a15a30.tar.gz |
gconf.bbclass: Drop configure/install/upgarde checks since not all SCMs support these in postinstalls
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5137 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/gconf.bbclass | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index 686f8e6596..4fba876854 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass | |||
@@ -1,32 +1,28 @@ | |||
1 | DEPENDS += "gconf" | 1 | DEPENDS += "gconf" |
2 | 2 | ||
3 | gconf_postinst() { | 3 | gconf_postinst() { |
4 | if [ "$1" = configure ]; then | 4 | if [ "x$D" != "x" ]; then |
5 | if [ "x$D" != "x" ]; then | 5 | exit 1 |
6 | exit 1 | ||
7 | fi | ||
8 | SCHEMA_LOCATION=/etc/gconf/schemas | ||
9 | for SCHEMA in ${SCHEMA_FILES}; do | ||
10 | if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then | ||
11 | HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ | ||
12 | gconftool-2 \ | ||
13 | --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null | ||
14 | fi | ||
15 | done | ||
16 | fi | 6 | fi |
7 | SCHEMA_LOCATION=/etc/gconf/schemas | ||
8 | for SCHEMA in ${SCHEMA_FILES}; do | ||
9 | if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then | ||
10 | HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ | ||
11 | gconftool-2 \ | ||
12 | --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null | ||
13 | fi | ||
14 | done | ||
17 | } | 15 | } |
18 | 16 | ||
19 | gconf_prerm() { | 17 | gconf_prerm() { |
20 | if [ "$1" = remove ] || [ "$1" = upgrade ]; then | 18 | SCHEMA_LOCATION=/etc/gconf/schemas |
21 | SCHEMA_LOCATION=/etc/gconf/schemas | 19 | for SCHEMA in ${SCHEMA_FILES}; do |
22 | for SCHEMA in ${SCHEMA_FILES}; do | 20 | if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then |
23 | if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then | 21 | HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ |
24 | HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ | 22 | gconftool-2 \ |
25 | gconftool-2 \ | 23 | --makefile-uninstall-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null |
26 | --makefile-uninstall-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null | 24 | fi |
27 | fi | 25 | done |
28 | done | ||
29 | fi | ||
30 | } | 26 | } |
31 | 27 | ||
32 | python populate_packages_append () { | 28 | python populate_packages_append () { |