diff options
| author | Kevin Tian <kevin.tian@intel.com> | 2010-08-11 13:34:54 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-12 15:39:24 +0100 |
| commit | e101642a61fc418273c1cd4d58a9564b4bdecc5c (patch) | |
| tree | 8890d90be0403bd1a9161f32ceb3d5cd1b7a27b5 /meta/packages/dbus | |
| parent | cf1e754b3fee3c7ae907e7ae30233083d7892215 (diff) | |
| download | openembedded-core-e101642a61fc418273c1cd4d58a9564b4bdecc5c.tar.gz openembedded-core-e101642a61fc418273c1cd4d58a9564b4bdecc5c.tar.bz2 openembedded-core-e101642a61fc418273c1cd4d58a9564b4bdecc5c.tar.xz openembedded-core-e101642a61fc418273c1cd4d58a9564b4bdecc5c.zip | |
populate-volatile.sh: cleanup duplicated invocations and remove boot warning
For one, populate-volatile.sh is itself a rcS script which is invoked earlier
than package's own postinst method (last one in rcS). If package has already
installed their volatile files correctly, it doesn't make sense to update volatile
again in postinst since nothing is changed.
On the other hand, dbus/hal are special since their user/group are only created
in the target. If they pre-install volatiles like others, populate-volatile.sh
will report "undefined user" since at that time their user/group haven't been
created. The better way solving this is to generate their volatile in the fly
after user/group are created, and then update volatiles.
This fix [BUGID #121]
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/dbus')
| -rw-r--r-- | meta/packages/dbus/dbus-1.2.24/99_dbus | 1 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus.inc | 10 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus_1.2.24.bb | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/meta/packages/dbus/dbus-1.2.24/99_dbus b/meta/packages/dbus/dbus-1.2.24/99_dbus deleted file mode 100644 index 6821ae4db..000000000 --- a/meta/packages/dbus/dbus-1.2.24/99_dbus +++ /dev/null @@ -1 +0,0 @@ -d messagebus messagebus 0755 /var/run/dbus none diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc index a085287fc..90a38e66a 100644 --- a/meta/packages/dbus/dbus.inc +++ b/meta/packages/dbus/dbus.inc @@ -9,8 +9,7 @@ DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ file://fix-install-daemon.patch; \ - file://dbus-1.init \ - file://99_dbus" + file://dbus-1.init" inherit autotools pkgconfig gettext update-rc.d @@ -54,6 +53,10 @@ pkg_postinst_dbus() { grep -q netdev: /etc/group || addgroup netdev chmod u+s /usr/libexec/dbus-daemon-launch-helper + + # add volatile after new user/grp are created + echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus + /etc/init.d/populate-volatile.sh update } EXTRA_OECONF_X = "--with-x" @@ -70,9 +73,6 @@ EXTRA_OECONF = "--disable-tests \ do_install() { autotools_do_install - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/ - install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 } diff --git a/meta/packages/dbus/dbus_1.2.24.bb b/meta/packages/dbus/dbus_1.2.24.bb index f331b140a..8e3e329fd 100644 --- a/meta/packages/dbus/dbus_1.2.24.bb +++ b/meta/packages/dbus/dbus_1.2.24.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r0" +PR = "r1" |