Changeset 89c57b6 in mainline for boot/Makefile

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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 (modified) (3 diffs)

boot/Makefile

@@ -48 +48 @@
 endif
 ifeq ($(RDFMT),fat)
-        $(MKFAT) $(DIST_PATH) $@
+        $(MKFAT) 1048576 $(DIST_PATH) $@
 endif
 
@@ -61 +61 @@
                 cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
         done
-
+        for drv in $(RD_DRVS) ; do \
+                mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" ; \
+        done
+        for file in $(RD_DRV_CFG) ; do \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file" "$(DIST_PATH)/$(DRVS_PATH)/$$file" ; \
+        done
+        
 clean: clean_dist
         $(MAKE) -f $(BUILD) clean PRECHECK=$(PRECHECK)
@@ -72 +80 @@
 
 clean_dist:
-        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) *.co
+        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
         rm -f $(USPACE_PATH)/dist/srv/*
+        rm -rf $(USPACE_PATH)/dist/drv/*
         rm -f $(USPACE_PATH)/dist/app/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*