Changeset 5e18892 in mainline

Timestamp:

2010-01-04T20:34:42Z (14 years ago)

Author:

Lukas Mejdrech <lukas@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b648ae4

Parents:

b4ff8a6d

Message:

+ Networking architecture 'none' to avoid networking at all

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.common (modified) (4 diffs)
• uspace/srv/net/Makefile (modified) (1 diff)

HelenOS.config

@@ -488 +488 @@
 
 % Networking architecture
+@ "none" No networking
 @ "modular" Modular
 @ "module" One module

boot/Makefile.common

@@ -45 +45 @@
 
 RD_SRVS = \
-        $(USPACEDIR)/srv/net/net/net \
-        $(USPACEDIR)/srv/net/netif/lo/lo \
-        $(USPACEDIR)/srv/net/netif/dp8390/dp8390 \
-        $(USPACEDIR)/srv/net/nil/eth/eth \
-        $(USPACEDIR)/srv/net/nil/nildummy/nildummy \
-        $(USPACEDIR)/srv/net/app/echo/echo \
         $(USPACEDIR)/srv/fb/fb \
         $(USPACEDIR)/srv/kbd/kbd \
@@ -62 +56 @@
 
 RD_APPS = \
-        $(USPACEDIR)/srv/net/net/start/netstart \
-        $(USPACEDIR)/srv/net/app/ping/ping \
-        $(USPACEDIR)/srv/net/app/nettest1/nettest1 \
-        $(USPACEDIR)/srv/net/app/nettest2/nettest2 \
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getterm/getterm \
@@ -90 +80 @@
 endif
 
+NET_SRVS = \
+        $(USPACEDIR)/srv/net/net/net \
+        $(USPACEDIR)/srv/net/netif/lo/lo \
+        $(USPACEDIR)/srv/net/netif/dp8390/dp8390 \
+        $(USPACEDIR)/srv/net/nil/eth/eth \
+        $(USPACEDIR)/srv/net/nil/nildummy/nildummy \
+        $(USPACEDIR)/srv/net/app/echo/echo
+
+NET_APPS = \
+        $(USPACEDIR)/srv/net/net/start/netstart \
+        $(USPACEDIR)/srv/net/app/ping/ping \
+        $(USPACEDIR)/srv/net/app/nettest1/nettest1 \
+        $(USPACEDIR)/srv/net/app/nettest2/nettest2
+
+ifeq ($(NETWORKING), module)
+        RD_APPS +=      $(NET_APPS)
+
+        RD_SRVS +=      $(NET_SRVS)
+else
 ifeq ($(NETWORKING), modular)
+        RD_APPS +=      $(NET_APPS)
+
+        RD_SRVS +=      $(NET_SRVS)
+
         RD_SRVS +=      $(USPACEDIR)/srv/net/il/ip/ip \
                         $(USPACEDIR)/srv/net/il/arp/arp \
@@ -97 +110 @@
                         $(USPACEDIR)/srv/net/tl/icmp/icmp
 endif
+endif
 

uspace/srv/net/Makefile

@@ -54 +54 @@
         BUILDS := $(addsuffix .build,$(DIRS))
 else
+ifeq ($(NETWORKING), modular)
         BUILDS := $(addsuffix .build,$(DIRS_ALL))
+endif
 endif