Changeset 61ee6df in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2010-02-16T22:16:33Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7fb2ce3

Parents:

76ecb300 (diff), b20e7c0 (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 the networking branch and necessary fixes.

File:

• boot/arch/amd64/Makefile.inc (modified) (5 diffs, 1 prop)

boot/arch/amd64/Makefile.inc

@@ -39 +39 @@
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         mkdir -p $(TMP)/boot/grub
         cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
@@ -56 +56 @@
         done
         
+        rm -f $(USPACEDIR)/dist/srv/*
+        rm -f $(USPACEDIR)/dist/app/*
+        rm -f $(USPACEDIR)/dist/cfg/net/*
+        
         cp $(KERNELDIR)/kernel.bin $(TMP)/boot/
         for task in $(INIT_TASKS) ; do \
@@ -65 +69 @@
         for file in $(RD_APPS) ; do \
                 cp $$file $(USPACEDIR)/dist/app/ ; \
+        done
+        for file in $(NET_CFG) ; do \
+                cp $$file $(USPACEDIR)/dist/cfg/net/ ; \
         done
         
@@ -78 +85 @@
 
 clean:
+        rm -f $(USPACEDIR)/dist/srv/*
+        rm -f $(USPACEDIR)/dist/app/*
+        rm -f $(USPACEDIR)/dist/cfg/net/*
+
         for file in $(RD_SRVS) ; do \
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
@@ -84 +95 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
+        for file in $(NET_CFG) ; do \
+                rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \
+        done
         rm -fr $(TMP)
         rm -f $(BASE)/image.iso