diff options
| author | Juergen Borleis <jbe@pengutronix.de> | 2015-02-20 10:19:01 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-03-01 10:50:56 +0100 |
| commit | a71518c2599d3784be728bdfc9042d94a59a0c6b (patch) | |
| tree | 8403e21a338f5bfa72e8ddf54372fa6678a3e071 /rules/networkmanager.make | |
| parent | 1f1831afb5617dec060143be51c1607c889320e7 (diff) | |
| download | ptxdist-a71518c2599d3784be728bdfc9042d94a59a0c6b.tar.gz ptxdist-a71518c2599d3784be728bdfc9042d94a59a0c6b.tar.xz | |
NetworkManager: update package
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/networkmanager.make')
| -rw-r--r-- | rules/networkmanager.make | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/rules/networkmanager.make b/rules/networkmanager.make index ca7cd6594..1ec0d2c87 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 0.9.8.8 -NETWORKMANAGER_MD5 := bad2486578aa9f4d2f5c1c1446e8daf4 +NETWORKMANAGER_VERSION := 1.0.0 +NETWORKMANAGER_MD5 := 71cae8707a90fa92e28cafbc9262b548 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) @@ -44,27 +44,37 @@ NETWORKMANAGER_CONF_OPT := \ --enable-ifupdown \ --disable-ifnet \ --disable-qt \ - --disable-bluez4 \ --disable-wimax \ --disable-polkit \ --disable-modify-system \ --disable-ppp \ + --disable-bluez5-dun \ --disable-concheck \ --enable-more-warnings \ --disable-vala \ --disable-tests \ - --disable-doc \ --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \ --with-systemdsystemunitdir=/lib/systemd/system \ - --with-session-tracking=none \ + --with-session-tracking=no \ + --with-suspend-resume=systemd \ --with-crypto=gnutls \ + --with-dbus-sys-dir=/etc/dbus-1/system.d \ --without-modem-manager-1 \ --with-dhclient=/sbin/dhclient \ --without-dhcpcd \ --without-resolvconf \ --without-netconfig \ - --with-iptables=/usr/sbin/iptables - + --with-iptables=/usr/sbin/iptables \ + --with-dnsmasq=/usr/sbin/dnsmasq \ + --without-system-ca-path \ + --with-kernel-firmware-dir=/lib/firmware \ + --without-libsoup \ + --without-nmtui \ + --without-valgrind \ + --without-tests # ---------------------------------------------------------------------------- # Install @@ -102,7 +112,7 @@ $(STATEDIR)/networkmanager.targetinstall: @$(call install_fixup, networkmanager,PRIORITY,optional) @$(call install_fixup, networkmanager,SECTION,base) @$(call install_fixup, networkmanager,AUTHOR,"Jan Luebbe <j.luebbe@pengutronix.de>") - @$(call install_fixup, networkmanager,DESCRIPTION,missing) + @$(call install_fixup, networkmanager,DESCRIPTION, "networkmanager") @$(call install_alternative, networkmanager, 0, 0, 0644, /etc/NetworkManager/NetworkManager.conf) @$(call install_copy, networkmanager, 0, 0, 0755, /etc/NetworkManager/dispatcher.d/) @@ -144,15 +154,21 @@ ifdef PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT endif @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/sbin/NetworkManager) +ifdef PTXCONF_NETWORKMANAGER_NM_ONLINE @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-online) - @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-tool) +endif @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmcli) @$(call install_tree, networkmanager, 0, 0, -, /usr/libexec/) @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-settings-plugin-ifupdown) +ifdef PTXCONF_NETWORKMANAGER_WIRELESS + @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wifi) +endif + @$(call install_lib, networkmanager, 0, 0, 0644, libnm) @$(call install_lib, networkmanager, 0, 0, 0644, libnm-util) @$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib) + @$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib-vpn) @$(call install_tree, networkmanager, 0, 0, -, /etc/dbus-1/system.d/) @$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system-services/) |