Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,87 @@
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Mon, 20 Jul 2015 11:01:04 +0200
|
||||
Subject: [PATCH] platform: move link_get_user_ipv6ll_enabled() to nm-platform-linux
|
||||
Source: https://mail.gnome.org/archives/networkmanager-list/2015-July/msg00028.html
|
||||
|
||||
This fixes build error kernels headers < 3.17.
|
||||
|
||||
Reported-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
---
|
||||
src/platform/nm-linux-platform.c | 16 ++++++++++++++++
|
||||
src/platform/nm-platform.c | 11 ++---------
|
||||
src/platform/nm-platform.h | 1 +
|
||||
3 files changed, 19 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
|
||||
index f3a9254..b6b8e33 100644
|
||||
--- a/src/platform/nm-linux-platform.c
|
||||
+++ b/src/platform/nm-linux-platform.c
|
||||
@@ -2987,6 +2987,21 @@ link_set_user_ipv6ll_enabled (NMPlatform *platform, int ifindex, gboolean enable
|
||||
}
|
||||
|
||||
static gboolean
|
||||
+link_get_user_ipv6ll_enabled (NMPlatform *platform, int ifindex)
|
||||
+{
|
||||
+#if HAVE_LIBNL_INET6_ADDR_GEN_MODE
|
||||
+ {
|
||||
+ const NMPlatformLink *pllink;
|
||||
+
|
||||
+ pllink = nm_platform_link_get (platform, ifindex);
|
||||
+ if (pllink && pllink->inet6_addr_gen_mode_inv)
|
||||
+ return _nm_platform_uint8_inv (pllink->inet6_addr_gen_mode_inv) == IN6_ADDR_GEN_MODE_NONE;
|
||||
+ }
|
||||
+#endif
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+static gboolean
|
||||
link_supports_carrier_detect (NMPlatform *platform, int ifindex)
|
||||
{
|
||||
const char *name = nm_platform_link_get_name (platform, ifindex);
|
||||
@@ -4968,6 +4968,7 @@
|
||||
platform_class->link_get_udev_device = link_get_udev_device;
|
||||
|
||||
platform_class->link_set_user_ipv6ll_enabled = link_set_user_ipv6ll_enabled;
|
||||
+ platform_class->link_get_user_ipv6ll_enabled = link_get_user_ipv6ll_enabled;
|
||||
|
||||
platform_class->link_set_address = link_set_address;
|
||||
platform_class->link_get_permanent_address = link_get_permanent_address;
|
||||
|
||||
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
|
||||
index 8803377..ee4b1a1 100644
|
||||
--- a/src/platform/nm-platform.c
|
||||
+++ b/src/platform/nm-platform.c
|
||||
@@ -965,15 +965,8 @@
|
||||
|
||||
g_return_val_if_fail (ifindex >= 0, FALSE);
|
||||
|
||||
-#if HAVE_LIBNL_INET6_ADDR_GEN_MODE
|
||||
- {
|
||||
- const NMPlatformLink *pllink;
|
||||
-
|
||||
- pllink = nm_platform_link_get (self, ifindex);
|
||||
- if (pllink && pllink->inet6_addr_gen_mode_inv)
|
||||
- return _nm_platform_uint8_inv (pllink->inet6_addr_gen_mode_inv) == IN6_ADDR_GEN_MODE_NONE;
|
||||
- }
|
||||
-#endif
|
||||
+ if (klass->link_get_user_ipv6ll_enabled)
|
||||
+ return klass->link_get_user_ipv6ll_enabled (self, ifindex);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
|
||||
index 16eb351..9ef4080 100644
|
||||
--- a/src/platform/nm-platform.h
|
||||
+++ b/src/platform/nm-platform.h
|
||||
@@ -446,6 +446,7 @@
|
||||
GObject *(*link_get_udev_device) (NMPlatform *self, int ifindex);
|
||||
|
||||
gboolean (*link_set_user_ipv6ll_enabled) (NMPlatform *, int ifindex, gboolean enabled);
|
||||
+ gboolean (*link_get_user_ipv6ll_enabled) (NMPlatform *, int ifindex);
|
||||
|
||||
gboolean (*link_get_permanent_address) (NMPlatform *,
|
||||
int ifindex,
|
||||
--
|
||||
2.4.3
|
||||
@@ -0,0 +1,58 @@
|
||||
config BR2_PACKAGE_NETWORK_MANAGER
|
||||
bool "networkmanager"
|
||||
depends on BR2_USE_MMU # dbus
|
||||
depends on BR2_PACKAGE_HAS_UDEV
|
||||
# Tested with 3.2, but may even work with earlier versions
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_*
|
||||
select BR2_PACKAGE_DHCPCD if !BR2_PACKAGE_DHCP_CLIENT
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_DBUS_GLIB
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
select BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_LIBNL
|
||||
select BR2_PACKAGE_LIBGUDEV
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
select BR2_PACKAGE_WIRELESS_TOOLS
|
||||
select BR2_PACKAGE_WIRELESS_TOOLS_LIB
|
||||
select BR2_PACKAGE_READLINE
|
||||
select BR2_PACKAGE_LIBNDP
|
||||
help
|
||||
NetworkManager is a set of co-operative tools that make networking
|
||||
simple and straightforward. Whether WiFi, wired, 3G, or Bluetooth,
|
||||
NetworkManager allows you to quickly move from one network to
|
||||
another: once a network has been configured and joined once, it
|
||||
can be detected and re-joined automatically the next time it's
|
||||
available.
|
||||
|
||||
http://projects.gnome.org/NetworkManager/
|
||||
|
||||
if BR2_PACKAGE_NETWORK_MANAGER
|
||||
|
||||
config BR2_PACKAGE_NETWORK_MANAGER_TUI
|
||||
bool "nmtui support"
|
||||
select BR2_PACKAGE_NEWT
|
||||
help
|
||||
This option enables terminal based UI
|
||||
|
||||
config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
|
||||
bool "modem-manager support"
|
||||
select BR2_PACKAGE_MODEM_MANAGER
|
||||
select BR2_PACKAGE_MODEM_MANAGER_LIBMBIM
|
||||
select BR2_PACKAGE_MODEM_MANAGER_LIBQMI
|
||||
help
|
||||
This option enables support for ModemManager
|
||||
|
||||
config BR2_PACKAGE_NETWORK_MANAGER_PPPD
|
||||
bool "pppd support"
|
||||
select BR2_PACKAGE_PPPD
|
||||
help
|
||||
This option enables support for PPPD daemon
|
||||
endif
|
||||
|
||||
comment "NetworkManager needs udev /dev management and a (e)glibc toolchain w/ headers >= 3.7"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_PACKAGE_HAS_UDEV || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC
|
||||
46
deprecated/firmware/buildroot/package/network-manager/S45network-manager
Executable file
46
deprecated/firmware/buildroot/package/network-manager/S45network-manager
Executable file
@@ -0,0 +1,46 @@
|
||||
#!/bin/sh
|
||||
|
||||
prefix=/usr
|
||||
exec_prefix=/usr
|
||||
sbindir=${exec_prefix}/sbin
|
||||
|
||||
NETWORKMANAGER_BIN=${sbindir}/NetworkManager
|
||||
|
||||
[ -x $NETWORKMANAGER_BIN ] || exit 0
|
||||
|
||||
PID=`pidof NetworkManager`
|
||||
case "$1" in
|
||||
start)
|
||||
printf "Starting NetworkManager ... "
|
||||
[ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager
|
||||
if [ -z "$PID" ]; then
|
||||
$NETWORKMANAGER_BIN
|
||||
fi
|
||||
if [ ! -z "$PID" -o $? -gt 0 ]; then
|
||||
echo "failed!"
|
||||
else
|
||||
echo "done."
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
printf "Stopping NetworkManager ... "
|
||||
[ ! -z "$PID" ] && kill $PID > /dev/null 2>&1
|
||||
if [ $? -gt 0 ]; then
|
||||
echo "failed!"
|
||||
else
|
||||
echo "done."
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
sleep 1
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 {start|stop|restart|sleep|wake}"
|
||||
;;
|
||||
esac
|
||||
exit 0
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/NetworkManager-1.0.10.sha256sum
|
||||
sha256 1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc NetworkManager-1.0.10.tar.xz
|
||||
@@ -0,0 +1,88 @@
|
||||
################################################################################
|
||||
#
|
||||
# network-manager
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NETWORK_MANAGER_VERSION_MAJOR = 1.0
|
||||
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10
|
||||
NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
|
||||
NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
|
||||
NETWORK_MANAGER_INSTALL_STAGING = YES
|
||||
NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
|
||||
libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev
|
||||
NETWORK_MANAGER_LICENSE = GPLv2+ (app), LGPLv2+ (libnm-util)
|
||||
NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING
|
||||
|
||||
NETWORK_MANAGER_CONF_ENV = \
|
||||
ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
|
||||
ac_cv_file__etc_fedora_release=no \
|
||||
ac_cv_file__etc_mandriva_release=no \
|
||||
ac_cv_file__etc_debian_version=no \
|
||||
ac_cv_file__etc_redhat_release=no \
|
||||
ac_cv_file__etc_SuSE_release=no
|
||||
|
||||
|
||||
NETWORK_MANAGER_CONF_OPTS = \
|
||||
--mandir=$(STAGING_DIR)/usr/man/ \
|
||||
--disable-tests \
|
||||
--disable-qt \
|
||||
--disable-more-warnings \
|
||||
--without-docs \
|
||||
--with-crypto=gnutls \
|
||||
--with-iptables=/usr/sbin/iptables \
|
||||
--disable-ifupdown \
|
||||
--disable-ifnet
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += newt
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-nmtui=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += pppd
|
||||
NETWORK_MANAGER_CONF_OPTS += --enable-ppp
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --disable-ppp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y)
|
||||
NETWORK_MANAGER_DEPENDENCIES += modem-manager
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1
|
||||
else
|
||||
NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DHCPCD),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
|
||||
endif
|
||||
|
||||
# uClibc by default doesn't have backtrace support, so don't use it
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
|
||||
NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace
|
||||
endif
|
||||
|
||||
define NETWORK_MANAGER_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 0755 -D package/network-manager/S45network-manager $(TARGET_DIR)/etc/init.d/S45network-manager
|
||||
endef
|
||||
|
||||
define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
|
||||
ln -sf /usr/lib/systemd/system/NetworkManager.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
|
||||
|
||||
ln -sf /usr/lib/systemd/system/NetworkManager.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
|
||||
|
||||
ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user