Changeset 23b7c02 in mainline for boot/Makefile.common

Timestamp:

2013-09-04T06:58:57Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

7664469

Parents:

caf5382 (diff), aa2a049 (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 with Mainline changes.

File:

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

boot/Makefile.common

@@ -121 +121 @@
         $(USPACE_PATH)/srv/taskmon/taskmon
 
-RD_DRVS = \
-        infrastructure/root \
+RD_DRVS_ESSENTIAL = \
+        infrastructure/root
+
+RD_DRVS_NON_ESSENTIAL = \
         infrastructure/rootvirt \
         fb/kfb \
@@ -174 +176 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/loc/loc \
+        $(USPACE_PATH)/app/mixerctl/mixerctl \
         $(USPACE_PATH)/app/logset/logset \
         $(USPACE_PATH)/app/mkfat/mkfat \
@@ -238 +241 @@
 RD_SRVS = $(RD_SRVS_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL)
+RD_DRVS = $(RD_DRVS_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
+RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
 endif