diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 18:22:47 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 18:22:47 +0100 |
| commit | 1eef4d96ba12f2fb790861c3217cecbf4f45942d (patch) | |
| tree | e81a89732f840199b234e14a0b2d4c4c8e7ab807 /package/base-files/Makefile | |
| parent | 113aa6cc7edfcc04a4b3d334bb4a32a2812dd118 (diff) | |
| parent | 9b69269c78ddc3411482c6ecac91bb9c7faff996 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files/Makefile')
| -rw-r--r-- | package/base-files/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0b0f95950..7b0ececcd 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 65 +PKG_RELEASE:= 66 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -111,11 +111,11 @@ ifneq (${ADK_SIMPLE_NETWORK_CONFIG},) echo -e "auto lo\niface lo inet loopback" > ${IDIR_BASE_FILES}/etc/network/interfaces # network config eth0 - # configure nic with manual ip + # configure nic with dhcp ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC},y) echo -e "\nauto eth0\niface eth0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces endif - # configure nic with dhcp + # configure nic with manual ip ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL},y) echo -e "\nauto eth0\niface eth0 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces echo -e " address ${SIMPLE_NETWORK_CONFIG_ETH0_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces @@ -137,12 +137,17 @@ ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP},y) echo -e " bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces endif + # network config wlan0 +ifeq (${SIMPLE_NETWORK_CONFIG_WLAN0_TYPE_NIC},y) + echo -e "\nauto wlan0\niface wlan0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces +endif + # network config eth1 - # configure nic with manual ip + # configure nic with dhcp ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC},y) echo -e "\nauto eth1\niface eth1 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces endif - # configure nic with dhcp + # configure nic with manual ip ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL},y) echo -e "\nauto eth1\niface eth1 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces echo -e " address ${SIMPLE_NETWORK_CONFIG_ETH1_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces |