# HG changeset patch # User anatofuz # Date 1564134396 -32400 # Node ID 2fdcb0f953bb40903c319d4575d04d42492bff8a # Parent 58c79e0c5101b922915457a4f8c4b55ef273e6e3 cp fs.img to CMAKE_SOURCE_DIR diff -r 58c79e0c5101 -r 2fdcb0f953bb src/gearsTools/pmake.pl --- a/src/gearsTools/pmake.pl Fri Jul 26 18:25:02 2019 +0900 +++ b/src/gearsTools/pmake.pl Fri Jul 26 18:46:36 2019 +0900 @@ -33,7 +33,7 @@ $cflags =~ s/\n//g; create_link_script(); -print_exec_system($cmake, "-DGCC_LIB=$libgcc", "-DCBC_COM=$cc", "-DPMAKE_ARGS=\"$cflags\"","-DCMAKE_ASM_COMPILER=$cc","-DX_CMAKE_LINKER=$ld","-DX_CMAKE_C_LINK_EXECUTABLE=\"$ld $ldflags -o kernel.elf $libgcc -b binary initcode usr/fs.img\"","-DKERNEL_LINK_EXECUTABLE=\"$kernel_ld_command\"","-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",@ARGV); +print_exec_system($cmake, "-DGCC_LIB=$libgcc", "-DCBC_COM=$cc", "-DPMAKE_ARGS=\"$cflags\"","-DCMAKE_ASM_COMPILER=$cc","-DX_CMAKE_LINKER=$ld","-DX_CMAKE_C_LINK_EXECUTABLE=\"$ld $ldflags -o kernel.elf $libgcc -b binary initcode fs.img\"","-DKERNEL_LINK_EXECUTABLE=\"$kernel_ld_command\"","-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE",@ARGV); system("make"); #system("sh","link.sh"); diff -r 58c79e0c5101 -r 2fdcb0f953bb src/usr/CMakeLists.txt --- a/src/usr/CMakeLists.txt Fri Jul 26 18:25:02 2019 +0900 +++ b/src/usr/CMakeLists.txt Fri Jul 26 18:46:36 2019 +0900 @@ -67,6 +67,6 @@ endforeach(i) add_custom_target(fs.img ALL - COMMAND ../tools/mkfs fs.img ${_USR_COMMANDS} UNIX + COMMAND ../tools/mkfs fs.img ${_USR_COMMANDS} UNIX \; cp fs.img ${CMAKE_SOURCE_DIR} DEPENDS ${_USR_COMMANDS} mkfs )