summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-04 11:34:26 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-04 11:34:26 +0000
commit9a90cab4761addf35222e0210943fc16c3a15a30 (patch)
tree8be9dbd76067ee4f8b4051ce2a06e97a709ba69a /meta
parent15e4284e092ada6ca7d96ad44a0b3c5d9fb04866 (diff)
downloadopenembedded-core-9a90cab4761addf35222e0210943fc16c3a15a30.tar.gz
openembedded-core-9a90cab4761addf35222e0210943fc16c3a15a30.tar.bz2
openembedded-core-9a90cab4761addf35222e0210943fc16c3a15a30.zip
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')
-rw-r--r--meta/classes/gconf.bbclass40
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 @@
DEPENDS += "gconf"
gconf_postinst() {
-if [ "$1" = configure ]; then
- if [ "x$D" != "x" ]; then
- exit 1
- fi
- SCHEMA_LOCATION=/etc/gconf/schemas
- for SCHEMA in ${SCHEMA_FILES}; do
- if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
- HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
- gconftool-2 \
- --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
- fi
- done
+if [ "x$D" != "x" ]; then
+ exit 1
fi
+SCHEMA_LOCATION=/etc/gconf/schemas
+for SCHEMA in ${SCHEMA_FILES}; do
+ if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
+ HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+ gconftool-2 \
+ --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
+ fi
+done
}
gconf_prerm() {
-if [ "$1" = remove ] || [ "$1" = upgrade ]; then
- SCHEMA_LOCATION=/etc/gconf/schemas
- for SCHEMA in ${SCHEMA_FILES}; do
- if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
- HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
- gconftool-2 \
- --makefile-uninstall-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
- fi
- done
-fi
+SCHEMA_LOCATION=/etc/gconf/schemas
+for SCHEMA in ${SCHEMA_FILES}; do
+ if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
+ HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+ gconftool-2 \
+ --makefile-uninstall-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
+ fi
+done
}
python populate_packages_append () {