Disabled build_cmd from BUILD bash script. Now essentials are built with kernel build process.

BUILD

@@ -683,7 +683,17 @@ build_a_cmd()
 #   $1 -> cmd name
 clean_a_cmd()
 {
-	cd ${CMD_DIR}/$1
+	if [ -d "${CMD_DIR}/$1" ]
+	then
+		cd ${CMD_DIR}/$1
+	else
+		if [ $1 = ipconfig ]
+		then
+			cd ${CMD_DIR}/ip/$1
+		else
+		cd ${CMD_DIR}
+		fi
+	fi
 	DO_NOTHING=0
 	cmd_${1} 2
 	if [ $DO_NOTHING -eq 0 ]

BUILD.conf

@@ -53,7 +53,9 @@ BUILD_LIBS="lib9p libString libauth libauthsrv libavl libbin libbio libcomplete
 BUILD_KLIBS="libc libip libdraw"
 
 ### CMD ###
-BUILD_CMD="rc bind mount cat cp echo ls ipconfig ps mkdir pwd chmod rio date dd vga ping telnet dhcpclient srv testalarm"
+#BUILD_CMD="rc bind mount cat cp echo ls ipconfig ps mkdir pwd chmod rio date dd vga ping telnet dhcpclient srv testalarm"
+# Now essentials are included in build.go
+BUILD_CMD=""
 
 
 ### functions ###
@@ -61,7 +63,7 @@ test_hello()
 {
 	BUILD_IN="hello.c"
 	BUILD_OUT="hello"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="stdio c"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -70,7 +72,7 @@ test_to_fork()
 {
 	BUILD_IN="to_fork.c"
 	BUILD_OUT="to_fork"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="stdio c"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -79,7 +81,7 @@ test_saymyname()
 {
 	BUILD_IN="say.c"
 	BUILD_OUT="say"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="stdio c"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -87,7 +89,7 @@ cmd_dd()
 {
 	BUILD_IN="dd.c"
 	BUILD_OUT="dd.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -95,7 +97,7 @@ cmd_date()
 {
 	BUILD_IN="date.c"
 	BUILD_OUT="date.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -103,7 +105,7 @@ cmd_chmod()
 {
 	BUILD_IN="chmod.c"
 	BUILD_OUT="chmod.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -112,7 +114,7 @@ cmd_pwd()
 {
 	BUILD_IN="pwd.c"
 	BUILD_OUT="pwd.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -121,7 +123,7 @@ cmd_mkdir()
 {
 	BUILD_IN="mkdir.c"
 	BUILD_OUT="mkdir.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -130,7 +132,7 @@ cmd_rio()
 {
 	BUILD_IN="data.c  fsys.c  rio.c  scrl.c  time.c  util.c  wctl.c  wind.c  xfid.c"
 	BUILD_OUT="rio.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libcomplete libframe libdraw  libthread libplumb libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -143,7 +145,7 @@ cmd_vga()
 			att20c49x.c  clgd542x.c  data.c       et4000hwgc.c  icd2061a.c  mach32.c   mga2164w.c  palette.c   rgb524mn.c  s3generic.c  t2r4.c      tvp3025.c       vesa.c          vision864.c  w30c516.c \
 			att21c498.c  clgd546x.c  db.c         hiqvideo.c    ics2494.c   mach64.c   mga4xx.c    pci.c       s3801.c     s3hwgc.c     template.c  tvp3025clock.c  vesadb.c        vision964.c"
 	BUILD_OUT="vga.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="ndb bio libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -152,7 +154,7 @@ cmd_srv()
 {
 	BUILD_IN="srv.c"
 	BUILD_OUT="srv.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libauth bio ip libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -162,7 +164,7 @@ cmd_dhcpclient()
 	BUILD_DIR=${CMD_DIR}/ip
 	BUILD_IN="dhcpclient.c"
 	BUILD_OUT="dhcpclient.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="bio ip libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -172,7 +174,7 @@ cmd_telnet()
 	BUILD_DIR=${CMD_DIR}/ip
 	BUILD_IN="telnet.c"
 	BUILD_OUT="telnet.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="bio ip libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -181,26 +183,26 @@ cmd_ping()
 	BUILD_DIR=${CMD_DIR}/ip
 	BUILD_IN="ping.c"
 	BUILD_OUT="ping.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="ndb bio ip libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
 
-#cmd_ipconfig()
-#{
-#	BUILD_DIR=${CMD_DIR}/ip/ipconfig
-#	BUILD_IN="ipv6.c main.c ppp.c"
-#	BUILD_OUT="ipconfig.elf.out"
-#	CLEAN_COM="rm -f *.o"
-#	LIBS_TO_LINK="9p ndb bio ip libc"
-#	LDFLAGS_EXTRA="-static -e_main"
-#}
+cmd_ipconfig()
+{
+	BUILD_DIR=${CMD_DIR}/ip/ipconfig
+	BUILD_IN="ipv6.c main.c ppp.c"
+	BUILD_OUT="ipconfig.elf.out"
+	CLEAN_COM="rm -f *.elf.* *.o"
+	LIBS_TO_LINK="9p ndb bio ip libc"
+	LDFLAGS_EXTRA="-static -e_main"
+}
 
 cmd_ps()
 {
 	BUILD_IN="ps.c"
 	BUILD_OUT="ps.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="bio libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -208,7 +210,7 @@ cmd_ls()
 {
 	BUILD_IN="ls.c"
 	BUILD_OUT="ls.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="bio libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -216,7 +218,7 @@ cmd_cp()
 {
 	BUILD_IN="cp.c"
 	BUILD_OUT="cp.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -225,7 +227,7 @@ cmd_echo()
 {
 	BUILD_IN="echo.c"
 	BUILD_OUT="echo.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -234,7 +236,7 @@ cmd_testalarm()
 {
 	BUILD_IN="testalarm.c"
 	BUILD_OUT="testalarm.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -243,61 +245,61 @@ cmd_cat()
 {
 	BUILD_IN="cat.c"
 	BUILD_OUT="cat.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
 
-#cmd_rc()
-#{
-#	BUILD_IN="	code.c \
-#				exec.c \
-#				getflags.c \
-#				glob.c \
-#				havefork.c \
-#				here.c \
-#				io.c \
-#				lex.c \
-#				pcmd.c \
-#				pfnc.c \
-#				plan9.c \
-#				simple.c \
-#				subr.c \
-#				trap.c \
-#				tree.c \
-#				var.c \
-#				y.tab.c \
-#				"
-#	BUILD_OUT="rc.elf.out"
-#	CLEAN_COM="rm -f *.o *.tab.*"
-#	LIBS_TO_LINK="String libc"
-#	LDFLAGS_EXTRA="-static -e_main"
+cmd_rc()
+{
+	BUILD_IN="	code.c \
+				exec.c \
+				getflags.c \
+				glob.c \
+				havefork.c \
+				here.c \
+				io.c \
+				lex.c \
+				pcmd.c \
+				pfnc.c \
+				plan9.c \
+				simple.c \
+				subr.c \
+				trap.c \
+				tree.c \
+				var.c \
+				y.tab.c \
+				"
+	BUILD_OUT="rc.elf.out"
+	CLEAN_COM="rm -f *.o *.tab.* *.elf.*"
+	LIBS_TO_LINK="String libc"
+	LDFLAGS_EXTRA="-static -e_main"
 	
 	#Extra tasks if we're compiling
-#	if [ $1 -eq 1 ]
-#	then
-#		echo "$PARSER_GEN -d syn.y"
-#		$PARSER_GEN -d syn.y
-#		if [ $? -ne 0 ]
-#		then
-#			echo "ERROR executing $PARSER_GEN"
-#			exit 1
-#		fi
-#		echo "cp y.tab.h x.tab.h"
-#		cp y.tab.h x.tab.h
-#		if [ $? -ne 0 ]
-#		then
-#			echo "ERROR copying y.tab.h to x.tab.h"
-#		fi
-#	fi
-#}
+	if [ $1 -eq 1 ]
+	then
+		echo "$PARSER_GEN -d syn.y"
+		$PARSER_GEN -d syn.y
+		if [ $? -ne 0 ]
+		then
+			echo "ERROR executing $PARSER_GEN"
+			exit 1
+		fi
+		echo "cp y.tab.h x.tab.h"
+		cp y.tab.h x.tab.h
+		if [ $? -ne 0 ]
+		then
+			echo "ERROR copying y.tab.h to x.tab.h"
+		fi
+	fi
+}
 
 # One for command? ugh, do it better!!
 cmd_bind()
 {
 	BUILD_IN="bind.c"
 	BUILD_OUT="bind.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }
@@ -306,7 +308,7 @@ cmd_mount()
 {
 	BUILD_IN="mount.c"
 	BUILD_OUT="mount.elf.out"
-	CLEAN_COM="rm -f *.o"
+	CLEAN_COM="rm -f *.elf.* *.o"
 	LIBS_TO_LINK="auth libc"
 	LDFLAGS_EXTRA="-static -e_main"
 }

sys/src/9/k10/k8cpu

@@ -114,7 +114,7 @@ rootdir
 #	/amd64/bin/auth/factotum factotum
 #	/amd64/bin/ip/ipconfig ipconfig
 	/amd64/bin/ipconfig
-	/amd64/bin/ping
+#	/amd64/bin/ping
 	/amd64/bin/srv
 #	/amd64/bin/usb/usbd
 	/amd64/bin/rc
@@ -122,12 +122,12 @@ rootdir
 	/amd64/bin/bind
 	/amd64/bin/mount
 	/amd64/bin/echo
-	/amd64/bin/cat
+#	/amd64/bin/cat
 	/amd64/bin/ls
-	/amd64/bin/cp
-	/amd64/bin/ps
-	/amd64/bin/mkdir
-	/amd64/bin/pwd
+#	/amd64/bin/cp
+#	/amd64/bin/ps
+#	/amd64/bin/mkdir
+#	/amd64/bin/pwd
 	/amd64/bin/date
 #	../root/nvram nvram
 

sys/src/9/k10/k8cpu.json

@@ -4,7 +4,13 @@
     "Include":["core.json", "../386/386.json", "../ip/ip.json", "../port/port.json"], 
 	"Projects": [
 	"/sys/src/cmd/rc/kernel.json",
-	"/sys/src/cmd/ip/ipconfig/kernel.json"
+	"/sys/src/cmd/ip/ipconfig/kernel.json",
+	"/sys/src/cmd/bind.json",
+	"/sys/src/cmd/mount.json",
+	"/sys/src/cmd/date.json",
+	"/sys/src/cmd/srv.json",
+	"/sys/src/cmd/echo.json",
+	"/sys/src/cmd/ls.json"
 	],
     "Pre": [
 	"cp ../../../../rc/lib/rcmain rcmain",
@@ -20,40 +26,21 @@
 	"data2c _amd64_bin_mount mount.elf.out>> k8cpu.root.c",
 	"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",
-	"strip cat.elf.out",
-	"data2c _amd64_bin_cat cat.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/cp.elf.out cp.elf.out",
-	"strip cp.elf.out",
-	"data2c _amd64_bin_cp cp.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ls.elf.out ls.elf.out",
-	"strip ls.elf.out",
-	"data2c _amd64_bin_ls ls.elf.out>> k8cpu.root.c",
 	"cp ../../cmd/ip/ipconfig/ipconfig.elf.out ipconfig.elf.out",
 	"strip ipconfig.elf.out",
 	"data2c _amd64_bin_ipconfig ipconfig.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ip/ping.elf.out ping.elf.out",
-	"strip ping.elf.out",
-	"data2c _amd64_bin_ping ping.elf.out>> k8cpu.root.c",
 	"cp ../../cmd/srv.elf.out srv.elf.out",
 	"strip srv.elf.out",
 	"data2c _amd64_bin_srv srv.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ps.elf.out ps.elf.out",
-	"strip ps.elf.out",
-	"data2c _amd64_bin_ps ps.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/mkdir.elf.out mkdir.elf.out",
-	"strip mkdir.elf.out",
-	"data2c _amd64_bin_mkdir mkdir.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/pwd.elf.out pwd.elf.out",
-	"strip pwd.elf.out",
-	"data2c _amd64_bin_pwd pwd.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/chmod.elf.out chmod.elf.out",
-	"strip chmod.elf.out",
-	"data2c _amd64_bin_chmod chmod.elf.out>> k8cpu.root.c",
+	"cp ../../cmd/echo.elf.out echo.elf.out",
+	"strip echo.elf.out",
+	"data2c _amd64_bin_echo echo.elf.out>> k8cpu.root.c",
 	"cp ../../cmd/date.elf.out date.elf.out",
 	"strip date.elf.out",
-	"data2c _amd64_bin_date date.elf.out>> k8cpu.root.c"
+	"data2c _amd64_bin_date date.elf.out>> k8cpu.root.c",
+	"cp ../../cmd/ls.elf.out ls.elf.out",
+	"strip ls.elf.out",
+	"data2c _amd64_bin_ls ls.elf.out>> k8cpu.root.c"
     ],
     "SourceFiles":[
 	"cga.c",

sys/src/cmd/kernel.json

@@ -28,6 +28,7 @@
 	"/amd64/lib/libString.a",
 	"/amd64/lib/lib9p.a",
 	"/amd64/lib/libndb.a",
+	"/amd64/lib/libauth.a",
 	"/amd64/lib/libbio.a",
 	"/amd64/lib/libip.a",
 	"/amd64/lib/libc.a"