Changeset dffabf0 in mainline for boot/Makefile.common

Timestamp:

2011-01-05T19:08:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f03d3786

Parents:

e84d65a (diff), 196ef08 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Conflicts: no problem solving.
Added new apps to ignore list.

File:

• boot/Makefile.common (modified) (4 diffs)

boot/Makefile.common

@@ -101 +101 @@
         $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \
         $(USPACE_PATH)/srv/net/netif/lo/lo \
+        $(USPACE_PATH)/srv/net/nil/eth/eth \
+        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
         $(USPACE_PATH)/srv/net/il/arp/arp \
         $(USPACE_PATH)/srv/net/il/ip/ip \
@@ -117 +119 @@
 RD_DRV_CFG = 
 
-ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        RD_SRVS_NON_ESSENTIAL += \
-                $(USPACE_PATH)/srv/net/nil/eth/eth \
-                $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
-endif
-
 RD_APPS_ESSENTIAL = \
         $(USPACE_PATH)/app/bdsh/bdsh \
@@ -130 +126 @@
 RD_APPS_NON_ESSENTIAL = \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/kill/kill \
+        $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/sbi/sbi \
@@ -148 +146 @@
         $(USPACE_PATH)/app/top/top \
         $(USPACE_PATH)/app/usbinfo/usbinfo \
-        $(USPACE_PATH)/app/virtusbkbd/vuk
+        $(USPACE_PATH)/app/virtusbkbd/vuk \
+        $(USPACE_PATH)/app/websrv/websrv
 
 ifneq ($(CONFIG_BAREBONE),y)