Changeset b79d450 in mainline for boot/Makefile.common

Timestamp:

2010-01-27T20:35:49Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (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.

File:

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

boot/Makefile.common

@@ -27 +27 @@
 #
 
+-include ../Makefile.config
+
 TMP = distroot
 INITRD = initrd
@@ -46 +48 @@
 RD_SRVS = \
         $(USPACEDIR)/srv/bd/file_bd/file_bd \
+        $(USPACEDIR)/srv/bd/part/guid_part/g_part \
         $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
         $(USPACEDIR)/srv/clip/clip \
@@ -53 +56 @@
         $(USPACEDIR)/srv/fs/devfs/devfs \
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-        $(USPACEDIR)/srv/fs/fat/fat
+        $(USPACEDIR)/srv/fs/fat/fat \
+        $(USPACEDIR)/srv/taskmon/taskmon
 
 RD_APPS = \
@@ -60 +64 @@
         $(USPACEDIR)/app/getterm/getterm \
         $(USPACEDIR)/app/klog/klog \
+        $(USPACEDIR)/app/mkfat/mkfat \
         $(USPACEDIR)/app/redir/redir \
+        $(USPACEDIR)/app/taskdump/taskdump \
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/tetris/tetris \