This email list is read-only. Emails sent to this list will be discarded
----------------------------------
.../fontconfig/fontconfig-2.6.0/97_fontconfig | 1 +
meta/packages/fontconfig/fontconfig_2.6.0.bb | 15 ++++++++++++++-
meta/packages/networkmanager/networkmanager_svn.bb | 4 +++-
.../wpa-supplicant/files/99_wpa_supplicant | 1 +
.../packages/wpa-supplicant/wpa-supplicant-0.5.inc | 10 +++++++---
.../wpa-supplicant/wpa-supplicant_0.5.8.bb | 2 +-
6 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit 0e9f111c6c3fbd5743a0f3453a37aa79970967b3
Author: Rob Bradford <[EMAIL PROTECTED]>
Date: Fri Oct 31 12:53:23 2008 +0000
wpa_supplicant: Use volatiles for managing /var/run/wpa_supplicant
commit 03d16ab59d183eff3f747e9bb376b23b0a53f78f
Author: Rob Bradford <[EMAIL PROTECTED]>
Date: Fri Oct 31 12:32:21 2008 +0000
networkmanager: Remove conflicting directories (managed by volatiles)
commit 1f833df9f471754b7ec290aeb6213b30f26de181
Author: Rob Bradford <[EMAIL PROTECTED]>
Date: Fri Oct 31 12:17:40 2008 +0000
fontconfig: Use volatiles for managing /var/cache/fontconfig
Diff in this email is a maximum of 400 lines.
diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig
b/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig
new file mode 100644
index 0000000..2993959
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig
@@ -0,0 +1 @@
+d root root 0755 /var/cache/fontconfig none
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb
b/meta/packages/fontconfig/fontconfig_2.6.0.bb
index 3f7eca4..4a4c31f 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -3,8 +3,11 @@ LICENSE = "BSD"
DESCRIPTION = "A library for configuring and customizing font access."
DEPENDS = "expat freetype zlib"
+PR = "r1"
+
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
- file://fix-pkgconfig.patch;patch=1"
+ file://fix-pkgconfig.patch;patch=1 \
+ file://97_fontconfig"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -74,3 +77,13 @@ do_install () {
autotools_do_install
}
+do_install_append() {
+ install -d ${D}/etc/default/volatiles
+ install -m 0644 ${WORKDIR}/97_fontconfig ${D}/etc/default/volatiles
+ rmdir ${D}/var/cache/fontconfig
+ rmdir ${D}/var/cache/
+}
+
+pkg_postinst_hal () {
+ /etc/init.d/populate-volatile.sh update
+}
diff --git a/meta/packages/networkmanager/networkmanager_svn.bb
b/meta/packages/networkmanager/networkmanager_svn.bb
index 0061bb2..2ff20ca 100644
--- a/meta/packages/networkmanager/networkmanager_svn.bb
+++ b/meta/packages/networkmanager/networkmanager_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools
ppp gnome-common"
RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
PV = "0.7+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
file://no-restarts.diff;patch=1;pnum=0 \
@@ -33,6 +33,8 @@ do_install_append () {
install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
# This overwrites the provided init script
install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
+ rmdir ${D}/var/run/NetworkManager
+ rmdir ${D}/var/run
}
do_stage () {
diff --git a/meta/packages/wpa-supplicant/files/99_wpa_supplicant
b/meta/packages/wpa-supplicant/files/99_wpa_supplicant
new file mode 100644
index 0000000..6ff4dd8
--- /dev/null
+++ b/meta/packages/wpa-supplicant/files/99_wpa_supplicant
@@ -0,0 +1 @@
+d root root 0700 /var/run/wpa_supplicant none
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
index c8578e7..667b168 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
+++ b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
@@ -11,7 +11,8 @@ SRC_URI =
"http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
file://defaults-sane \
file://wpa-supplicant.sh \
file://wpa_supplicant.conf \
- file://wpa_supplicant.conf-sane"
+ file://wpa_supplicant.conf-sane \
+ file://99_wpa_supplicant"
S = "${WORKDIR}/wpa_supplicant-${PV}"
@@ -35,8 +36,6 @@ do_install () {
install -m 755 wpa_passphrase ${D}${sbindir}
install -m 755 wpa_cli ${D}${sbindir}
- install -d ${D}${localstatedir}/run/wpa_supplicant
-
install -d ${D}${docdir}/wpa_supplicant
install -m 644 README ${WORKDIR}/wpa_supplicant.conf
${D}${docdir}/wpa_supplicant
@@ -54,9 +53,14 @@ do_install () {
install -d ${D}/${sysconfdir}/dbus-1/system.d
install -m 644 ${S}/dbus-wpa_supplicant.conf
${D}/${sysconfdir}/dbus-1/system.d
+
+ install -d ${D}/etc/default/volatiles
+ install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
}
pkg_postinst_wpa-supplicant () {
+ /etc/init.d/populate-volatile.sh update
+
# can't do this offline
if [ "x$D" != "x" ]; then
exit 1
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
index e4babb2..440cdeb 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
@@ -1,3 +1,3 @@
require wpa-supplicant-0.5.inc
-PR = "r4"
+PR = "r5"
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
