qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-02 16:55:25 +03:00
Code

enable netifd by default and add its config variable to PKG_CONFIG_DEPENDS in a few relevant places

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31730 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-05-14 23:33:35 +00:00
parent fb5042cd2e
commit 745d195d8e
9 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/target.mk
View File

@ -12,7 +12,7 @@ __target_inc=1
DEVICE_TYPE?=router DEVICE_TYPE?=router
# Default packages - the really basic set # 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 # For router targets
DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall
DEFAULT_PACKAGES.bootloader:= DEFAULT_PACKAGES.bootloader:=

2
package/6in4/Makefile
View File

@ -11,6 +11,8 @@ PKG_NAME:=6in4
PKG_VERSION:=10 PKG_VERSION:=10
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/6in4 define Package/6in4

2
package/6to4/Makefile
View File

@ -11,6 +11,8 @@ PKG_NAME:=6to4
PKG_VERSION:=8 PKG_VERSION:=8
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/6to4 define Package/6to4

2
package/base-files-network/Makefile
View File

@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/base-files-network define Package/base-files-network
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=@!USE_NETIFD DEPENDS:=@DISABLE_NETIFD
TITLE:=Network scripts for the OpenWrt base system TITLE:=Network scripts for the OpenWrt base system
URL:=http://openwrt.org/ URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE) VERSION:=$(PKG_RELEASE)

6
package/base-files/Makefile
View File

@ -35,7 +35,7 @@ endif
define Package/base-files define Package/base-files
SECTION:=base SECTION:=base
CATEGORY:=Base system 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 TITLE:=Base filesystem for OpenWrt
URL:=http://openwrt.org/ URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION) VERSION:=$(PKG_RELEASE)-$(REVISION)
@ -63,8 +63,8 @@ define Package/base-files/description
endef endef
define Package/base-files/config define Package/base-files/config
config USE_NETIFD config DISABLE_NETIFD
bool "Use netifd instead of the old network init scripts (experimental!)" bool "Use the old (deprecated) network init scripts instead of netifd"
default n default n
endef endef

4
package/comgt/Makefile
View File

@ -17,8 +17,8 @@ PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
PKG_CONFIG_DEPENDS:=CONFIG_USE_NETIFD PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
COMGT_VARIANT:=$(if $(CONFIG_USE_NETIFD),netifd,old) COMGT_VARIANT:=$(if $(CONFIG_PACKAGE_netifd),netifd,old)
FILES_DIR:=./files-$(COMGT_VARIANT) FILES_DIR:=./files-$(COMGT_VARIANT)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
package/netifd/Makefile
View File

@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/netifd define Package/netifd
SECTION:=base SECTION:=base
CATEGORY:=Base system 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 TITLE:=OpenWrt Network Interface Configuration Daemon
endef endef

1
package/ppp/Makefile
View File

@ -19,6 +19,7 @@ PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libpcap PKG_BUILD_DEPENDS:=libpcap
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
PKG_INSTALL:=1 PKG_INSTALL:=1

2
package/pptp/Makefile
View File

@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE_URL:=@SF/pptpclient
PKG_MD5SUM:=b47735ba5d6d37dfdbccb85afc044ede PKG_MD5SUM:=b47735ba5d6d37dfdbccb85afc044ede
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/pptp define Package/pptp