Fixes fill-kfs
authorBarret Rhoden <brho@cs.berkeley.edu>
Tue, 25 Jun 2013 22:35:15 +0000 (15:35 -0700)
committerBarret Rhoden <brho@cs.berkeley.edu>
Wed, 26 Jun 2013 05:20:24 +0000 (22:20 -0700)
Wasn't removing the libs or bins due to missing trailing slashes.

Makefile
tests/Makefile

index d1deefe..04fd2d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -544,14 +544,14 @@ PHONY += fill-kfs unfill-kfs
 XCC_SO_FILES = $(addprefix $(XCC_TARGET_ROOT)/lib/, *.so*)
 
 $(OBJDIR)/.dont-force-fill-kfs:
 XCC_SO_FILES = $(addprefix $(XCC_TARGET_ROOT)/lib/, *.so*)
 
 $(OBJDIR)/.dont-force-fill-kfs:
-       @rm -rf $(addprefix  $(FIRST_KFS_PATH)/lib, $(notdir $(XCC_SO_FILES)))
+       $(Q)rm -rf $(addprefix $(FIRST_KFS_PATH)/lib/, $(notdir $(XCC_SO_FILES)))
        @echo "Cross Compiler 'so' files removed from KFS"
        @$(MAKE) -f tests/Makefile unfill-kfs
        @touch $(OBJDIR)/.dont-force-fill-kfs
 
 fill-kfs: $(OBJDIR)/.dont-force-fill-kfs install-libs
        @mkdir -p $(FIRST_KFS_PATH)/lib
        @echo "Cross Compiler 'so' files removed from KFS"
        @$(MAKE) -f tests/Makefile unfill-kfs
        @touch $(OBJDIR)/.dont-force-fill-kfs
 
 fill-kfs: $(OBJDIR)/.dont-force-fill-kfs install-libs
        @mkdir -p $(FIRST_KFS_PATH)/lib
-       @cp -uP  $(XCC_SO_FILES) $(FIRST_KFS_PATH)/lib
+       $(Q)cp -uP $(XCC_SO_FILES) $(FIRST_KFS_PATH)/lib
        @echo "Cross Compiler 'so' files installed to KFS"
        @$(MAKE) -f tests/Makefile fill-kfs
 
        @echo "Cross Compiler 'so' files installed to KFS"
        @$(MAKE) -f tests/Makefile fill-kfs
 
index b735312..71b2429 100644 (file)
@@ -54,7 +54,7 @@ fill-kfs: $(TESTS_EXECS)
        @echo "User space tests installed to KFS"
 
 unfill-kfs:
        @echo "User space tests installed to KFS"
 
 unfill-kfs:
-       $(Q)rm -rf $(addprefix  $(FIRST_KFS_PATH)/bin, $(notdir $(TESTS_EXECS)))
+       $(Q)rm -rf $(addprefix $(FIRST_KFS_PATH)/bin/, $(notdir $(TESTS_EXECS)))
        @echo "User space tests removed from KFS"
 
 clean:
        @echo "User space tests removed from KFS"
 
 clean: