summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-08-11 13:34:54 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-12 15:39:24 +0100
commite101642a61fc418273c1cd4d58a9564b4bdecc5c (patch)
tree8890d90be0403bd1a9161f32ceb3d5cd1b7a27b5 /meta
parentcf1e754b3fee3c7ae907e7ae30233083d7892215 (diff)
downloadpoky-e101642a61fc418273c1cd4d58a9564b4bdecc5c.tar.gz
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')
-rw-r--r--meta/packages/dbus/dbus-1.2.24/99_dbus1
-rw-r--r--meta/packages/dbus/dbus.inc10
-rw-r--r--meta/packages/dbus/dbus_1.2.24.bb2
-rw-r--r--meta/packages/devicekit/devicekit_git.bb4
-rw-r--r--meta/packages/fontconfig/fontconfig_2.8.0.bb10
-rw-r--r--meta/packages/hal/files/99_hal2
-rw-r--r--meta/packages/hal/hal.inc6
-rw-r--r--meta/packages/hal/hal_0.5.14.bb2
-rw-r--r--meta/packages/hal/hal_git.bb2
-rw-r--r--meta/packages/networkmanager/networkmanager_svn.bb9
-rw-r--r--meta/packages/pam/pam_1.1.1.bb6
-rw-r--r--meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc2
-rw-r--r--meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb2
-rw-r--r--meta/packages/yum/yum_3.2.27.bb6
14 files changed, 17 insertions, 47 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 6821ae4dba..0000000000
--- a/meta/packages/dbus/dbus-1.2.24/99_dbus
+++ /dev/null
@@ -1 +0,0 @@
1d messagebus messagebus 0755 /var/run/dbus none
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index a085287fc4..90a38e66a9 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"
9SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 9SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
10 file://tmpdir.patch; \ 10 file://tmpdir.patch; \
11 file://fix-install-daemon.patch; \ 11 file://fix-install-daemon.patch; \
12 file://dbus-1.init \ 12 file://dbus-1.init"
13 file://99_dbus"
14 13
15inherit autotools pkgconfig gettext update-rc.d 14inherit autotools pkgconfig gettext update-rc.d
16 15
@@ -54,6 +53,10 @@ pkg_postinst_dbus() {
54 53
55 grep -q netdev: /etc/group || addgroup netdev 54 grep -q netdev: /etc/group || addgroup netdev
56 chmod u+s /usr/libexec/dbus-daemon-launch-helper 55 chmod u+s /usr/libexec/dbus-daemon-launch-helper
56
57 # add volatile after new user/grp are created
58 echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus
59 /etc/init.d/populate-volatile.sh update
57} 60}
58 61
59EXTRA_OECONF_X = "--with-x" 62EXTRA_OECONF_X = "--with-x"
@@ -70,9 +73,6 @@ EXTRA_OECONF = "--disable-tests \
70do_install() { 73do_install() {
71 autotools_do_install 74 autotools_do_install
72 75
73 install -d ${D}/etc/default/volatiles
74 install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/
75
76 install -d ${D}${sysconfdir}/init.d 76 install -d ${D}${sysconfdir}/init.d
77 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 77 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
78} 78}
diff --git a/meta/packages/dbus/dbus_1.2.24.bb b/meta/packages/dbus/dbus_1.2.24.bb
index f331b140aa..8e3e329fde 100644
--- a/meta/packages/dbus/dbus_1.2.24.bb
+++ b/meta/packages/dbus/dbus_1.2.24.bb
@@ -1,3 +1,3 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r0" 3PR = "r1"
diff --git a/meta/packages/devicekit/devicekit_git.bb b/meta/packages/devicekit/devicekit_git.bb
index 06bcfd3f12..74b639f6c1 100644
--- a/meta/packages/devicekit/devicekit_git.bb
+++ b/meta/packages/devicekit/devicekit_git.bb
@@ -5,7 +5,7 @@ SRC_URI = "git://anongit.freedesktop.org/DeviceKit/DeviceKit;protocol=git \
5 file://volatile" 5 file://volatile"
6 6
7PV = "002+git${SRCREV}" 7PV = "002+git${SRCREV}"
8PR = "r1" 8PR = "r2"
9SRCREV = "014d168ba4bf40c9bae487bacff8bf2aa054b5f6" 9SRCREV = "014d168ba4bf40c9bae487bacff8bf2aa054b5f6"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
@@ -25,8 +25,6 @@ pkg_postinst_devicekit () {
25 exit 1 25 exit 1
26 fi 26 fi
27 27
28 /etc/init.d/populate-volatile.sh update
29
30 DBUSPID=`pidof dbus-daemon` 28 DBUSPID=`pidof dbus-daemon`
31 29
32 if [ "x$DBUSPID" != "x" ]; then 30 if [ "x$DBUSPID" != "x" ]; then
diff --git a/meta/packages/fontconfig/fontconfig_2.8.0.bb b/meta/packages/fontconfig/fontconfig_2.8.0.bb
index f83d72cdda..e0403ecb3c 100644
--- a/meta/packages/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.8.0.bb
@@ -11,7 +11,7 @@ SECTION = "libs"
11 11
12DEPENDS = "expat freetype zlib" 12DEPENDS = "expat freetype zlib"
13 13
14PR = "r0" 14PR = "r1"
15 15
16SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ 16SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
17 file://fix-pkgconfig.patch \ 17 file://fix-pkgconfig.patch \
@@ -73,17 +73,9 @@ do_configure_append () {
73 73
74} 74}
75 75
76do_install () {
77 autotools_do_install
78}
79
80do_install_append() { 76do_install_append() {
81 install -d ${D}${sysconfdir}/default/volatiles 77 install -d ${D}${sysconfdir}/default/volatiles
82 install -m 0644 ${WORKDIR}/97_fontconfig ${D}${sysconfdir}/default/volatiles 78 install -m 0644 ${WORKDIR}/97_fontconfig ${D}${sysconfdir}/default/volatiles
83 rmdir ${D}${localstatedir}/cache/fontconfig 79 rmdir ${D}${localstatedir}/cache/fontconfig
84 rmdir ${D}${localstatedir}/cache/ 80 rmdir ${D}${localstatedir}/cache/
85} 81}
86
87pkg_postinst_hal () {
88 /etc/init.d/populate-volatile.sh update
89}
diff --git a/meta/packages/hal/files/99_hal b/meta/packages/hal/files/99_hal
deleted file mode 100644
index c82da990ba..0000000000
--- a/meta/packages/hal/files/99_hal
+++ /dev/null
@@ -1,2 +0,0 @@
1d root root 0700 /var/run/hald none
2d haldaemon haldaemon 0755 /var/cache/hald none
diff --git a/meta/packages/hal/hal.inc b/meta/packages/hal/hal.inc
index 29ceadcfa6..839dfd0652 100644
--- a/meta/packages/hal/hal.inc
+++ b/meta/packages/hal/hal.inc
@@ -10,7 +10,6 @@ DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native exp
10RDEPENDS += "udev hal-info" 10RDEPENDS += "udev hal-info"
11 11
12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \ 12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
13 file://99_hal \
14 file://20hal" 13 file://20hal"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig
@@ -37,8 +36,6 @@ PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '
37PACKAGE_ARCH_emenlow := "${PACKAGE_ARCH}" 36PACKAGE_ARCH_emenlow := "${PACKAGE_ARCH}"
38 37
39do_install_append() { 38do_install_append() {
40 install -d ${D}/etc/default/volatiles
41 install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
42 install -d ${D}/etc/dbus-1/event.d 39 install -d ${D}/etc/dbus-1/event.d
43 install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d 40 install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
44} 41}
@@ -53,6 +50,9 @@ pkg_postinst_hal () {
53 grep haldaemon /etc/group || addgroup haldaemon 50 grep haldaemon /etc/group || addgroup haldaemon
54 grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL 51 grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
55 52
53 # add volatile after new user/grp are created
54 echo "d root root 0700 /var/run/hald none" > /etc/default/volatiles/99_hal
55 echo "d haldaemon haldaemon 0755 /var/cache/hald none" >> /etc/default/volatiles/99_hal
56 /etc/init.d/populate-volatile.sh update 56 /etc/init.d/populate-volatile.sh update
57 57
58 DBUSPID=`pidof dbus-daemon` 58 DBUSPID=`pidof dbus-daemon`
diff --git a/meta/packages/hal/hal_0.5.14.bb b/meta/packages/hal/hal_0.5.14.bb
index 470934a43e..a12be729cb 100644
--- a/meta/packages/hal/hal_0.5.14.bb
+++ b/meta/packages/hal/hal_0.5.14.bb
@@ -1,6 +1,6 @@
1require hal.inc 1require hal.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" 5EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
6EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'" 6EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index d9205ec945..baed472375 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -1,7 +1,7 @@
1require hal.inc 1require hal.inc
2 2
3PV = "0.5.9.1+git${SRCDATE}" 3PV = "0.5.9.1+git${SRCDATE}"
4PR = "r6" 4PR = "r7"
5 5
6SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ 6SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
7 file://20hal \ 7 file://20hal \
diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
index f60496db70..40f04e497c 100644
--- a/meta/packages/networkmanager/networkmanager_svn.bb
+++ b/meta/packages/networkmanager/networkmanager_svn.bb
@@ -8,7 +8,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common p
8RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" 8RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
9 9
10PV = "0.7+svnr${SRCREV}" 10PV = "0.7+svnr${SRCREV}"
11PR = "r9" 11PR = "r10"
12 12
13SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ 13SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
14 file://no-restarts.diff;patch=1;pnum=0 \ 14 file://no-restarts.diff;patch=1;pnum=0 \
@@ -38,13 +38,6 @@ do_install_append () {
38 rmdir ${D}/var/run 38 rmdir ${D}/var/run
39} 39}
40 40
41pkg_postinst_${PN} () {
42 if [ "x$D" != "x" ]; then
43 exit 1
44 fi
45 /etc/init.d/populate-volatile.sh update
46}
47
48PACKAGES =+ "libnmutil libnmglib" 41PACKAGES =+ "libnmutil libnmglib"
49 42
50FILES_libnmutil += "${libdir}/libnm-util.so.*" 43FILES_libnmutil += "${libdir}/libnm-util.so.*"
diff --git a/meta/packages/pam/pam_1.1.1.bb b/meta/packages/pam/pam_1.1.1.bb
index 7ef4d2d251..ad53a32f76 100644
--- a/meta/packages/pam/pam_1.1.1.bb
+++ b/meta/packages/pam/pam_1.1.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/"
3BUGTRACKER = "http://sourceforge.net/projects/pam/support" 3BUGTRACKER = "http://sourceforge.net/projects/pam/support"
4# PAM allows dual licensed under GPL and BSD 4# PAM allows dual licensed under GPL and BSD
5LICENSE = "GPLv2+ | BSD" 5LICENSE = "GPLv2+ | BSD"
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \ 8SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \
9 file://disable_crossbinary.patch \ 9 file://disable_crossbinary.patch \
@@ -37,7 +37,3 @@ do_install() {
37 install -d ${D}/etc/default/volatiles 37 install -d ${D}/etc/default/volatiles
38 install -m 0644 ${WORKDIR}/99_pam ${D}/etc/default/volatiles 38 install -m 0644 ${WORKDIR}/99_pam ${D}/etc/default/volatiles
39} 39}
40
41pkg_postinst_${PN} () {
42 /etc/init.d/populate-volatile.sh update
43}
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc
index b1641061ff..78ce914c31 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/packages/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -67,8 +67,6 @@ pkg_postinst_wpa-supplicant () {
67 exit 1 67 exit 1
68 fi 68 fi
69 69
70 /etc/init.d/populate-volatile.sh update
71
72 DBUSPID=`pidof dbus-daemon` 70 DBUSPID=`pidof dbus-daemon`
73 71
74 if [ "x$DBUSPID" != "x" ]; then 72 if [ "x$DBUSPID" != "x" ]; then
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb
index c6ebbaff4b..d1f6c6d6c9 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.7.2.bb
@@ -1,3 +1,3 @@
1require wpa-supplicant-0.7.inc 1require wpa-supplicant-0.7.inc
2 2
3PR = "r0" 3PR = "r1"
diff --git a/meta/packages/yum/yum_3.2.27.bb b/meta/packages/yum/yum_3.2.27.bb
index aff44ca6fe..acebc79dde 100644
--- a/meta/packages/yum/yum_3.2.27.bb
+++ b/meta/packages/yum/yum_3.2.27.bb
@@ -13,7 +13,7 @@ RDEPENDS = "python-rpm python-core python-iniparse python-urlgrabber \
13 python-textutils python-fcntl python-email \ 13 python-textutils python-fcntl python-email \
14 yum-metadata-parser" 14 yum-metadata-parser"
15 15
16PR = "r8" 16PR = "r9"
17 17
18SRC_URI = "http://yum.baseurl.org/download/3.2/yum-${PV}.tar.gz \ 18SRC_URI = "http://yum.baseurl.org/download/3.2/yum-${PV}.tar.gz \
19 file://paths.patch;apply=yes \ 19 file://paths.patch;apply=yes \
@@ -41,10 +41,6 @@ do_install_append () {
41 install -m 0644 ${WORKDIR}/98_yum ${D}/etc/default/volatiles 41 install -m 0644 ${WORKDIR}/98_yum ${D}/etc/default/volatiles
42} 42}
43 43
44pkg_postinst_yum () {
45 /etc/init.d/populate-volatile.sh update
46}
47
48FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli" 44FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli"
49 45
50BBCLASSEXTEND = "native" 46BBCLASSEXTEND = "native"