NetworkManager: added patch to create two dirs required by dhcp connections, bumprev.

This commit is contained in:
Juan RP 2010-11-09 10:39:58 +01:00
parent b08fbab467
commit f005562c82
3 changed files with 56 additions and 0 deletions

View file

@ -0,0 +1,45 @@
From cbb0d6d116e2d5e844c2c118f2f707d10e6b6fc4 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 08 Nov 2010 15:09:54 +0000
Subject: build: create NM state directory at install time
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c01df0..d7dccaa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -275,8 +275,10 @@ EXTRA_DIST = \
$(NetworkManager_DATA)
rundir=$(localstatedir)/run/NetworkManager
+statedir=$(localstatedir)/lib/NetworkManager
install-data-hook:
$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
+ $(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
CLEANFILES = $(BUILT_SOURCES)
--
cgit v0.8.3-6-g21f6
From e8da63889b4124cfe3344e38b0931abf208e98da Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 08 Nov 2010 15:07:08 +0000
Subject: keyfile: create keyfile data directory during install
So distributions don't have to do it.
---
diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am
index 1c1fd4a..c519adc 100644
--- a/system-settings/plugins/keyfile/Makefile.am
+++ b/system-settings/plugins/keyfile/Makefile.am
@@ -49,6 +49,8 @@ libnm_settings_plugin_keyfile_la_LIBADD = \
$(DBUS_LIBS) \
$(GIO_LIBS)
+keyfiledir=$(sysconfdir)/NetworkManager/system-connections
+
install-data-hook:
$(mkinstalldirs) -m 0755 $(DESTDIR)$(keyfiledir)
--
cgit v0.8.3-6-g21f6

View file

@ -0,0 +1 @@
-Np1

View file

@ -1,6 +1,7 @@
# Template file for 'NetworkManager' # Template file for 'NetworkManager'
pkgname=NetworkManager pkgname=NetworkManager
version=0.8.2 version=0.8.2
revision=1
distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2" distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
build_style=gnu_configure build_style=gnu_configure
configure_args="--localstatedir=/var --with-distro=gentoo configure_args="--localstatedir=/var --with-distro=gentoo
@ -31,6 +32,7 @@ Add_dependency run dbus-glib
Add_dependency run dbus-libs Add_dependency run dbus-libs
Add_dependency run glib Add_dependency run glib
Add_dependency run libgudev Add_dependency run libgudev
Add_dependency build pkg-config Add_dependency build pkg-config
Add_dependency build libuuid-devel Add_dependency build libuuid-devel
Add_dependency build nss-devel Add_dependency build nss-devel
@ -46,10 +48,18 @@ Add_dependency build libnl-devel
Add_dependency build polkit-devel Add_dependency build polkit-devel
Add_dependency build ppp-devel Add_dependency build ppp-devel
Add_dependency build iptables-devel Add_dependency build iptables-devel
Add_dependency build automake
Add_dependency full iproute2 Add_dependency full iproute2
Add_dependency full dhcpcd Add_dependency full dhcpcd
Add_dependency full wpa_supplicant Add_dependency full wpa_supplicant
pre_configure()
{
cd ${wrksrc} && autoreconf -fi
}
post_install() post_install()
{ {
# Fix path to pppd. # Fix path to pppd.