enable netifd by default and add its config variable to PKG_CONFIG_DEPENDS in a few relevant places
SVN-Revision: 31730
This commit is contained in:
parent
a6e7b3cffe
commit
5eed1d8f6b
9 changed files with 15 additions and 8 deletions
|
@ -12,7 +12,7 @@ __target_inc=1
|
|||
DEVICE_TYPE?=router
|
||||
|
||||
# Default packages - the really basic set
|
||||
DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2
|
||||
DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 netifd
|
||||
# For router targets
|
||||
DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall
|
||||
DEFAULT_PACKAGES.bootloader:=
|
||||
|
|
|
@ -11,6 +11,8 @@ PKG_NAME:=6in4
|
|||
PKG_VERSION:=10
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/6in4
|
||||
|
|
|
@ -11,6 +11,8 @@ PKG_NAME:=6to4
|
|||
PKG_VERSION:=8
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/6to4
|
||||
|
|
|
@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
|
|||
define Package/base-files-network
|
||||
SECTION:=base
|
||||
CATEGORY:=Base system
|
||||
DEPENDS:=@!USE_NETIFD
|
||||
DEPENDS:=@DISABLE_NETIFD
|
||||
TITLE:=Network scripts for the OpenWrt base system
|
||||
URL:=http://openwrt.org/
|
||||
VERSION:=$(PKG_RELEASE)
|
||||
|
|
|
@ -35,7 +35,7 @@ endif
|
|||
define Package/base-files
|
||||
SECTION:=base
|
||||
CATEGORY:=Base system
|
||||
DEPENDS:=+!USE_NETIFD:base-files-network +USE_NETIFD:netifd
|
||||
DEPENDS:=+DISABLE_NETIFD:base-files-network +!DISABLE_NETIFD:netifd
|
||||
TITLE:=Base filesystem for OpenWrt
|
||||
URL:=http://openwrt.org/
|
||||
VERSION:=$(PKG_RELEASE)-$(REVISION)
|
||||
|
@ -63,8 +63,8 @@ define Package/base-files/description
|
|||
endef
|
||||
|
||||
define Package/base-files/config
|
||||
config USE_NETIFD
|
||||
bool "Use netifd instead of the old network init scripts (experimental!)"
|
||||
config DISABLE_NETIFD
|
||||
bool "Use the old (deprecated) network init scripts instead of netifd"
|
||||
default n
|
||||
endef
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@ PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
|
|||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
|
||||
|
||||
PKG_CONFIG_DEPENDS:=CONFIG_USE_NETIFD
|
||||
COMGT_VARIANT:=$(if $(CONFIG_USE_NETIFD),netifd,old)
|
||||
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
|
||||
COMGT_VARIANT:=$(if $(CONFIG_PACKAGE_netifd),netifd,old)
|
||||
FILES_DIR:=./files-$(COMGT_VARIANT)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
|
|
@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/cmake.mk
|
|||
define Package/netifd
|
||||
SECTION:=base
|
||||
CATEGORY:=Base system
|
||||
DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn @USE_NETIFD
|
||||
DEPENDS:=+libuci +libnl-tiny +libubus +ubus +ubusd +jshn @!DISABLE_NETIFD
|
||||
TITLE:=OpenWrt Network Interface Configuration Daemon
|
||||
endef
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57
|
|||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
|
||||
PKG_BUILD_DEPENDS:=libpcap
|
||||
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
|
||||
|
||||
PKG_INSTALL:=1
|
||||
|
||||
|
|
|
@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|||
PKG_SOURCE_URL:=@SF/pptpclient
|
||||
PKG_MD5SUM:=b47735ba5d6d37dfdbccb85afc044ede
|
||||
|
||||
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/pptp
|
||||
|
|
Loading…
Reference in a new issue