Changeset 99de22b in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2010-01-15T18:30:25Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

eeb643d

Parents:

387416b (diff), 563d6077 (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:

Merged latest trunk changes.

File:

• boot/arch/amd64/Makefile.inc (modified) (2 diffs)

boot/arch/amd64/Makefile.inc

@@ -30 +30 @@
 
 RD_SRVS += \
-        $(USPACEDIR)/srv/pci/pci \
-        $(USPACEDIR)/srv/bd/ata_bd/ata_bd
+        $(USPACEDIR)/srv/bd/ata_bd/ata_bd \
+        $(USPACEDIR)/srv/hw/char/i8042/i8042 \
+        $(USPACEDIR)/srv/hw/bus/pci/pci \
+        $(USPACEDIR)/srv/hid/c_mouse/c_mouse
 
 MODULES := $(notdir $(COMPONENTS))
@@ -47 +49 @@
         echo "  root (cd)" >> $(TMP)/boot/grub/menu.lst
         for module in $(MODULES) $(INITRD).img ; do \
-                if [ $$module == kernel.bin ] ; then \
+                if [ $$module = kernel.bin ] ; then \
                         echo "  kernel /boot/$$module" >> $(TMP)/boot/grub/menu.lst ; \
                 else \