summaryrefslogtreecommitdiffstats
path: root/meta-extras/packages/networkmanager
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-09-23 11:38:11 +0000
committerRoss Burton <ross@openedhand.com>2007-09-23 11:38:11 +0000
commited66764821441b3ab8fde48edf2ff4b221d9e5ed (patch)
treec84fbfec9c834fedb9aadad0c2d1e4824926c7e2 /meta-extras/packages/networkmanager
parent0a5c898c901401ac0045bca5adfca569c8383bed (diff)
downloadpoky-ed66764821441b3ab8fde48edf2ff4b221d9e5ed.tar.gz
networkmanager: add svn trunk packages, fix up bad packaging, and backport fixes to 0.6
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2772 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/networkmanager')
-rw-r--r--meta-extras/packages/networkmanager/files/25NetworkManager (renamed from meta-extras/packages/networkmanager/files/NetworkManager)0
-rw-r--r--meta-extras/packages/networkmanager/files/build-fixes.diff78
-rw-r--r--meta-extras/packages/networkmanager/files/install-tools.patch16
-rw-r--r--meta-extras/packages/networkmanager/networkmanager_0.6svn.bb38
-rw-r--r--meta-extras/packages/networkmanager/networkmanager_svn.bb44
5 files changed, 151 insertions, 25 deletions
diff --git a/meta-extras/packages/networkmanager/files/NetworkManager b/meta-extras/packages/networkmanager/files/25NetworkManager
index 0beff63081..0beff63081 100644
--- a/meta-extras/packages/networkmanager/files/NetworkManager
+++ b/meta-extras/packages/networkmanager/files/25NetworkManager
diff --git a/meta-extras/packages/networkmanager/files/build-fixes.diff b/meta-extras/packages/networkmanager/files/build-fixes.diff
new file mode 100644
index 0000000000..d771c30563
--- /dev/null
+++ b/meta-extras/packages/networkmanager/files/build-fixes.diff
@@ -0,0 +1,78 @@
1Index: test/nm-tool.c
2===================================================================
3--- test/nm-tool.c (revision 2853)
4+++ test/nm-tool.c (working copy)
5@@ -148,7 +148,7 @@
6 GString *str;
7 gboolean active = FALSE;
8 guint32 flags, wpa_flags, rsn_flags;
9- GByteArray * ssid;
10+ const GByteArray * ssid;
11 char *tmp;
12
13 flags = nm_access_point_get_flags (ap);
14@@ -193,7 +193,6 @@
15 ssid = nm_access_point_get_ssid (ap);
16 tmp = g_strdup_printf (" %s%s", active ? "*" : "",
17 ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
18- g_byte_array_free (ssid, TRUE);
19
20 print_string (tmp, str->str);
21
22Index: callouts/nm-dhcp-client-action.c
23===================================================================
24--- callouts/nm-dhcp-client-action.c (revision 2853)
25+++ callouts/nm-dhcp-client-action.c (working copy)
26@@ -176,7 +176,7 @@
27 }
28
29
30-const char ** ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
31+static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
32
33 dbus_bool_t
34 build_message (DBusMessage * message)
35Index: src/nm-netlink.c
36===================================================================
37--- src/nm-netlink.c (revision 2853)
38+++ src/nm-netlink.c (working copy)
39@@ -19,6 +19,7 @@
40 * (C) Copyright 2007 Red Hat, Inc.
41 */
42
43+#include <asm/types.h>
44 #include "nm-netlink.h"
45 #include "nm-utils.h"
46
47Index: src/vpn-manager/nm-vpn-connection.c
48===================================================================
49--- src/vpn-manager/nm-vpn-connection.c (revision 2853)
50+++ src/vpn-manager/nm-vpn-connection.c (working copy)
51@@ -406,7 +406,7 @@
52 routes = nm_vpn_connection_get_routes (connection);
53 org_freedesktop_NetworkManager_VPN_Plugin_connect_async (priv->proxy,
54 nm_vpn_connection_get_vpn_data (connection),
55- routes,
56+ (const char**)routes,
57 nm_vpn_connection_connect_cb,
58 connection);
59
60Index: libnm-glib/libnm-glib-test.c
61===================================================================
62--- libnm-glib/libnm-glib-test.c (revision 2853)
63+++ libnm-glib/libnm-glib-test.c (working copy)
64@@ -165,13 +165,12 @@
65 static void
66 dump_access_point (NMAccessPoint *ap)
67 {
68- GByteArray * ssid;
69+ const GByteArray * ssid;
70 char * str;
71
72 ssid = nm_access_point_get_ssid (ap);
73 g_print ("\tSsid: %s\n",
74 ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
75- g_byte_array_free (ssid, TRUE);
76
77 str = nm_access_point_get_hw_address (ap);
78 g_print ("\tMAC Address: %s\n", str);
diff --git a/meta-extras/packages/networkmanager/files/install-tools.patch b/meta-extras/packages/networkmanager/files/install-tools.patch
new file mode 100644
index 0000000000..36cb9424f9
--- /dev/null
+++ b/meta-extras/packages/networkmanager/files/install-tools.patch
@@ -0,0 +1,16 @@
1Index: test/Makefile.am
2===================================================================
3--- test/Makefile.am (revision 2853)
4+++ test/Makefile.am (working copy)
5@@ -15,8 +15,9 @@
6 -DNM_RUN_DIR=\"$(rundir)\" \
7 -DDATADIR=\"$(datadir)\"
8
9-noinst_PROGRAMS = nm-tool \
10- nm-online \
11+bin_PROGRAMS = nm-tool \
12+ nm-online
13+noinst_PROGRAMS = \
14 nmtestdevices \
15 libnm_glib_test
16
diff --git a/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb b/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb
index a590bbfe3c..5272de7791 100644
--- a/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb
+++ b/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb
@@ -4,13 +4,13 @@ LICENSE = "GPL"
4HOMEPAGE = "http://www.gnome.org" 4HOMEPAGE = "http://www.gnome.org"
5PRIORITY = "optional" 5PRIORITY = "optional"
6DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools" 6DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
7RDEPENDS = "wpa-supplicant iproute2 dhcdbd" 7RDEPENDS = "hal wpa-supplicant iproute2 dhcdbd"
8PV = "0.6.4+svn${SRCDATE}" 8PV = "0.6.4+svn${SRCDATE}"
9 9
10PR = "r6" 10PR = "r6"
11 11
12SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \ 12SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
13 file://NetworkManager \ 13 file://25NetworkManager \
14 file://99_networkmanager" 14 file://99_networkmanager"
15 15
16EXTRA_OECONF = " \ 16EXTRA_OECONF = " \
@@ -23,7 +23,7 @@ EXTRA_OECONF = " \
23 23
24S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE" 24S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
25 25
26inherit autotools 26inherit autotools pkgconfig
27 27
28do_staging () { 28do_staging () {
29 autotools_stage_includes 29 autotools_stage_includes
@@ -31,34 +31,22 @@ do_staging () {
31 oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR} 31 oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR}
32} 32}
33 33
34do_install () { 34do_install_append () {
35 oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
36 oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
37
38 oe_runmake -C src DESTDIR="${D}" install
39 install -d ${D}/etc/default/volatiles 35 install -d ${D}/etc/default/volatiles
40 install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles 36 install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
41 install -d ${D}/etc/init.d/ 37 install -d ${D}/etc/dbus-1/event.d
42 install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/ 38 install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
43 install -d ${D}/${datadir}/
44} 39}
45 40
46pkg_postinst () { 41pkg_postinst () {
47 /etc/init.d/populate-volatile.sh update 42 /etc/init.d/populate-volatile.sh update
48} 43}
49 44
50FILES_${PN} += "${datadir} \ 45FILES_${PN} += "${libdir}/*.so."
51 ${libdir}/*.so* \
52 ${libdir}/*.la \
53 ${sbindir} \
54 ${bindir} \
55 ${sysconfdir} \
56 ${libexecdir}"
57
58FILES_${PN}-dev = "${incdir} \
59 ${libdir}/*.a \
60 ${libdir}/pkgconfig"
61 46
62# The networkmanager package needs to be split into app/lib/dev packages. For 47FILES_${PN}-dev = "${includedir}/* \
63# now, silence insane. 48 ${libdir}/*.so \
64INSANE_SKIP_${PN} = "1" 49 ${libdir}/*.a \
50 ${libdir}/pkgconfig/*.pc \
51 ${datadir}/NetworkManager/gdb-cmd \
52 "
diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta-extras/packages/networkmanager/networkmanager_svn.bb
new file mode 100644
index 0000000000..4106bcd047
--- /dev/null
+++ b/meta-extras/packages/networkmanager/networkmanager_svn.bb
@@ -0,0 +1,44 @@
1DESCRIPTION = "NetworkManager"
2SECTION = "net/misc"
3LICENSE = "GPL"
4HOMEPAGE = "http://www.gnome.org"
5PRIORITY = "optional"
6DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
7RDEPENDS = "hal wpa-supplicant iproute2"
8PV = "0.7+svn${SRCDATE}"
9
10SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
11 file://build-fixes.diff;patch=1;pnum=0 \
12 file://install-tools.patch;patch=1;pnum=0 \
13 file://25NetworkManager \
14 file://99_networkmanager"
15
16EXTRA_OECONF = " \
17 --with-distro=debian \
18 --with-ip=/sbin/ip"
19
20S = "${WORKDIR}/trunk"
21
22inherit autotools pkgconfig
23
24# TODO: stage
25
26do_install_append () {
27 install -d ${D}/etc/default/volatiles
28 install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
29 install -d ${D}/etc/dbus-1/event.d
30 install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
31}
32
33pkg_postinst () {
34 /etc/init.d/populate-volatile.sh update
35}
36
37FILES_${PN} += "${libdir}/*.so."
38
39FILES_${PN}-dev = "${includedir}/* \
40 ${libdir}/*.so \
41 ${libdir}/*.a \
42 ${libdir}/pkgconfig/*.pc \
43 ${datadir}/NetworkManager/gdb-cmd \
44 "