sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Kevin Tian 2010-08-11 13:34:54 +08:00 committed by Richard Purdie
parent cf1e754b3f
commit e101642a61
14 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/packages/dbus/dbus-1.2.24/99_dbus vendored
View File

@ -1 +0,0 @@
d messagebus messagebus 0755 /var/run/dbus none

10
meta/packages/dbus/dbus.inc
View File

@ -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
}

2
meta/packages/dbus/dbus_1.2.24.bb
View File

@ -1,3 +1,3 @@
include dbus.inc
PR = "r0"
PR = "r1"

4
meta/packages/devicekit/devicekit_git.bb
View File

@ -5,7 +5,7 @@ SRC_URI = "git://anongit.freedesktop.org/DeviceKit/DeviceKit;protocol=git \
file://volatile"
PV = "002+git${SRCREV}"
PR = "r1"
PR = "r2"
SRCREV = "014d168ba4bf40c9bae487bacff8bf2aa054b5f6"
S = "${WORKDIR}/git"
@ -25,8 +25,6 @@ pkg_postinst_devicekit () {
exit 1
fi
/etc/init.d/populate-volatile.sh update
DBUSPID=`pidof dbus-daemon`
if [ "x$DBUSPID" != "x" ]; then

10
meta/packages/fontconfig/fontconfig_2.8.0.bb
View File

@ -11,7 +11,7 @@ SECTION = "libs"
DEPENDS = "expat freetype zlib"
PR = "r0"
PR = "r1"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
@ -73,17 +73,9 @@ do_configure_append () {
}
do_install () {
autotools_do_install
}
do_install_append() {
install -d ${D}${sysconfdir}/default/volatiles
install -m 0644 ${WORKDIR}/97_fontconfig ${D}${sysconfdir}/default/volatiles
rmdir ${D}${localstatedir}/cache/fontconfig
rmdir ${D}${localstatedir}/cache/
}
pkg_postinst_hal () {
/etc/init.d/populate-volatile.sh update
}

2
meta/packages/hal/files/99_hal
View File

@ -1,2 +0,0 @@
d root root 0700 /var/run/hald none
d haldaemon haldaemon 0755 /var/cache/hald none

6
meta/packages/hal/hal.inc
View File

@ -10,7 +10,6 @@ DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native exp
RDEPENDS += "udev hal-info"
SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
file://99_hal \
file://20hal"
inherit autotools pkgconfig
@ -37,8 +36,6 @@ PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '
PACKAGE_ARCH_emenlow := "${PACKAGE_ARCH}"
do_install_append() {
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
install -d ${D}/etc/dbus-1/event.d
install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
}
@ -53,6 +50,9 @@ pkg_postinst_hal () {
grep haldaemon /etc/group || addgroup haldaemon
grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
# add volatile after new user/grp are created
echo "d root root 0700 /var/run/hald none" > /etc/default/volatiles/99_hal
echo "d haldaemon haldaemon 0755 /var/cache/hald none" >> /etc/default/volatiles/99_hal
/etc/init.d/populate-volatile.sh update
DBUSPID=`pidof dbus-daemon`

2
meta/packages/hal/hal_0.5.14.bb
View File

@ -1,6 +1,6 @@
require hal.inc
PR = "r1"
PR = "r2"
EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"

2
meta/packages/hal/hal_git.bb
View File

@ -1,7 +1,7 @@
require hal.inc
PV = "0.5.9.1+git${SRCDATE}"
PR = "r6"
PR = "r7"
SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
file://20hal \

9
meta/packages/networkmanager/networkmanager_svn.bb
View File

@ -8,7 +8,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common p
RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
PV = "0.7+svnr${SRCREV}"
PR = "r9"
PR = "r10"
SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
file://no-restarts.diff;patch=1;pnum=0 \
@ -38,13 +38,6 @@ do_install_append () {
rmdir ${D}/var/run
}
pkg_postinst_${PN} () {
if [ "x$D" != "x" ]; then
exit 1
fi
/etc/init.d/populate-volatile.sh update
}
PACKAGES =+ "libnmutil libnmglib"
FILES_libnmutil += "${libdir}/libnm-util.so.*"

6
meta/packages/pam/pam_1.1.1.bb
View File

@ -3,7 +3,7 @@ HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/"
BUGTRACKER = "http://sourceforge.net/projects/pam/support"
# PAM allows dual licensed under GPL and BSD
LICENSE = "GPLv2+ | BSD"
PR = "r1"
PR = "r2"
SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \
file://disable_crossbinary.patch \
@ -37,7 +37,3 @@ do_install() {
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_pam ${D}/etc/default/volatiles
}
pkg_postinst_${PN} () {
/etc/init.d/populate-volatile.sh update
}

2
meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc
View File

@ -67,8 +67,6 @@ pkg_postinst_wpa-supplicant () {
exit 1
fi
/etc/init.d/populate-volatile.sh update
DBUSPID=`pidof dbus-daemon`
if [ "x$DBUSPID" != "x" ]; then

2
meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb
View File

@ -1,3 +1,3 @@
require wpa-supplicant-0.7.inc
PR = "r0"
PR = "r1"

6
meta/packages/yum/yum_3.2.27.bb
View File

@ -13,7 +13,7 @@ RDEPENDS = "python-rpm python-core python-iniparse python-urlgrabber \
python-textutils python-fcntl python-email \
yum-metadata-parser"
PR = "r8"
PR = "r9"
SRC_URI = "http://yum.baseurl.org/download/3.2/yum-${PV}.tar.gz \
file://paths.patch;apply=yes \
@ -41,10 +41,6 @@ do_install_append () {
install -m 0644 ${WORKDIR}/98_yum ${D}/etc/default/volatiles
}
pkg_postinst_yum () {
/etc/init.d/populate-volatile.sh update
}
FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli"
BBCLASSEXTEND = "native"