Browse Source

BUILD kernel now it's the Go-json build process

Elbing Miss 9 years ago
parent
commit
a916402700
2 changed files with 18 additions and 8 deletions
  1. 13 3
      BUILD
  2. 5 5
      sys/src/9/k10/k8cpu.json

+ 13 - 3
BUILD

@@ -84,6 +84,15 @@ clean_kernel()
 	cd - > /dev/null
 }
 
+compile_kernel_go()
+{
+	export HARVEY="$_BUILD_DIR"
+	cd "$KRL_DIR"
+	$HARVEY/util/build k8cpu.json
+	cd "$PATH_ORI" > /dev/null
+
+}
+
 compile_kernel()
 {
 	CONF=$KERNEL_CONF
@@ -310,9 +319,10 @@ link_kernel()
 
 build_kernel()
 {
-	clean_kernel
-	compile_kernel
-	link_kernel
+#	clean_kernel
+#	compile_kernel
+#	link_kernel
+	compile_kernel_go
 	echo "KERNEL COMPILED OK"
 }
 

+ 5 - 5
sys/src/9/k10/k8cpu.json

@@ -5,18 +5,18 @@
 	"/sys/src/cmd/rc/kernel.json"
 	],
     "Pre": [
-	"cp /home/rminnich/projects/harvey/rc/lib/rcmain rcmain",
+	"cp ../../../../rc/lib/rcmain rcmain",
 	"data2c _rc_lib_rcmain rcmain >> k8cpu.root.c",
-	"cp /home/rminnich/projects/harvey/sys/src/cmd/rc/rc.elf.out rc.elf.out",
+	"cp ../../cmd/rc/rc.elf.out rc.elf.out",
 	"strip rc.elf.out",
 	"data2c _amd64_bin_rc rc.elf.out >> k8cpu.root.c",
-	"cp /home/rminnich/projects/harvey/sys/src/cmd/bind.elf.out bind.elf.out",
+	"cp ../../cmd/bind.elf.out bind.elf.out",
 	"strip bind.elf.out",
 	"data2c _amd64_bin_bind bind.elf.out>> k8cpu.root.c",
-	"cp /home/rminnich/projects/harvey/sys/src/cmd/mount.elf.out mount.elf.out",
+	"cp ../../cmd/mount.elf.out mount.elf.out",
 	"strip mount.elf.out",
 	"data2c _amd64_bin_mount mount.elf.out>> k8cpu.root.c",
-	"cp /home/rminnich/projects/harvey/sys/src/cmd/echo.elf.out echo.elf.out",
+	"cp ../../cmd/echo.elf.out echo.elf.out",
 	"strip echo.elf.out",
 	"data2c _amd64_bin_echo echo.elf.out>> k8cpu.root.c",
 	"cp ../../cmd/cat.elf.out cat.elf.out",