Changeset 49ff5f3 in mainline for boot/Makefile

Timestamp:

2012-04-18T20:55:21Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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

@@ -40 +40 @@
         $(PACK) $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) arch/$(KARCH) $(COMPONENTS)
 
-$(INITRD).img: $(INITRD).fs
-        $(MKHORD) $(PAGE_SIZE) $< $@
-
-$(INITRD).fs: build_dist
+$(INITRD).img: build_dist
 ifeq ($(RDFMT),tmpfs)
         $(MKTMPFS) $(DIST_PATH) $@
@@ -69 +66 @@
                 cp "$$file" "$(DIST_PATH)/app/" ; \
         done
-        for file in $(NET_CFG) ; do \
-                cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
-        done
         for drv in $(RD_DRVS) ; do \
                 drv_dir="`dirname "$$drv"`" ; \
@@ -95 +89 @@
 
 clean_dist:
-        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
+        rm -f $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*