Ignore:
Timestamp:
2010-02-16T20:13:01Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8b901f9
Parents:
76ecb300 (diff), 01a9ef5 (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 as it is.
Does not compile at the moment.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/arm32/loader/Makefile.build

    r76ecb300 r209faf9  
    7676
    7777$(DEPEND):
     78        rm -f $(USPACEDIR)/dist/srv/*
     79        rm -f $(USPACEDIR)/dist/app/*
     80        rm -f $(USPACEDIR)/dist/cfg/net/*
     81
    7882        for file in $(RD_SRVS) ; do \
    7983                cp $$file $(USPACEDIR)/dist/srv/ ; \
     
    8185        for file in $(RD_APPS) ; do \
    8286                cp $$file $(USPACEDIR)/dist/app/ ; \
     87        done
     88        for file in $(NET_CFG) ; do \
     89                cp $$file $(USPACEDIR)/dist/cfg/net/ ; \
    8390        done
    8491ifeq ($(RDFMT),tmpfs)
Note: See TracChangeset for help on using the changeset viewer.