[Zrouter-src] ZRouter.org: push to ZRouter profiles/SMALL_/profile.mk

Thu Oct 2 13:44:21 UTC 2014

details:   http://zrouter.org/hg/zrouter//rev/9c1c00e18ea5
changeset: 514:9c1c00e18ea5
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Thu Oct 02 16:42:57 2014 +0300
description:
Check switchctl/etherswitchcfg presence.

diffstat:

 profiles/SMALL_/profile.mk |  24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diffs (69 lines):

diff -r 84aaea99df31 -r 9c1c00e18ea5 profiles/SMALL_/profile.mk

--- a/profiles/SMALL_/profile.mk	Thu Oct 02 16:35:19 2014 +0300
+++ b/profiles/SMALL_/profile.mk	Thu Oct 02 16:42:57 2014 +0300
@@ -1,7 +1,3 @@
-
-
-
-
 
 WORLD_SUBDIRS_LIB+= \
 libalias \
@@ -72,6 +68,14 @@
 sync \
 uuidgen
 
+.if exists(${FREEBSD_SRC_TREE}/sbin/switchctl)
+_switchctl=switchctl
+.else
+.if exists(${FREEBSD_SRC_TREE}/sbin/etherswitchcfg)
+_switchctl=etherswitchcfg
+.endif
+.endif
+
 WORLD_SUBDIRS_SBIN+= \
 dmesg \
 ifconfig \
@@ -93,20 +97,13 @@
 rcorder \
 reboot \
 route \
-switchctl \
+${_switchctl} \
 sysctl \
 umount
 
-#/sbin/oinit
-
-
-
 WORLD_SUBDIRS_ZROUTER+=target/sbin/cdevd
 WORLD_SUBDIRS_ZROUTER+=target/usr.bin/hex2bin
 
-
-
-
 WORLD_SUBDIRS_USR_BIN+= \
 basename \
 cap_mkdb \
@@ -146,7 +143,6 @@
 #libreadline \
 # XXX: libreadline must be replaced with libedit
 
-
 WORLD_SUBDIRS_LIB+= \
 libfetch \
 libradius \
@@ -186,7 +182,6 @@
 libusb
 .endif
 
-
 KERNCONF_MODULES_OVERRIDE+=if_bridge bridgestp
 KERNCONF_MODULES_OVERRIDE+=libalias/libalias
 #KERNCONF_MODULES_OVERRIDE+=libalias/modules/cuseeme
@@ -199,4 +194,3 @@
 #KERNCONF_MODULES_OVERRIDE+=libalias/modules/skinny
 KERNCONF_MODULES_OVERRIDE+=geom/geom_label
 KERNCONF_MODULES_OVERRIDE+=md unionfs msdosfs ufs tmpfs
-
