Browse Source

ci: get bldy back in to the matrix

Signed-off-by: Sevki <s@sevki.org>
Sevki 7 years ago
parent
commit
299ab3c374
2 changed files with 8 additions and 5 deletions
  1. 2 4
      bootstrap.sh
  2. 6 1
      sys/src/9/amd64/BUILD

+ 2 - 4
bootstrap.sh

@@ -3,13 +3,10 @@
 echo Building the build tool...
 
 GOBIN="$(pwd)/util" GOPATH="$(pwd)/util/third_party:$(pwd)/util" go get -u github.com/Harvey-OS/ninep/cmd/ufs
+GOBIN="$(pwd)/util" GOPATH="$(pwd)/util/third_party:$(pwd)/util" go get -u github.com/bldy/build/cmd/bldy
 GOBIN="$(pwd)/util" GOPATH="$(pwd)/util/third_party:$(pwd)/util" go get harvey/cmd/...
 
 
-echo Downloading the blaze tool...
-curl -L http://sevki.co/get-build -o util/nuke
-chmod +x util/nuke
-
 # this will make booting a VM easier
 mkdir -p tmp
 
@@ -20,6 +17,7 @@ export ARCH=amd64
 ./util/build
 # See \`build -h' for more information on the build tool.
 
+To build with bldy just type bldy //:kernel 
 To enable access to files, create a harvey and none user:
 sudo useradd harvey
 sudo useradd none

+ 6 - 1
sys/src/9/amd64/BUILD

@@ -21,9 +21,11 @@ CORE_SRCS = [
 	"ctype.c",
 	"devarch.c",
 	"//sys/src/9/port/devdraw.c",
+	"//sys/src/9/port/devether.c",
 	"//sys/src/9/port/devmouse.c",
 	"//sys/src/9/port/devpci.c",
 	"devpmc.c",
+	"ether.c",
 	"fpu.c",
 	"i8254.c",
 	"i8259.c",
@@ -59,7 +61,6 @@ PORT_SRCS = [
 	"//sys/src/9/port/devcoreboot.c",
 	"//sys/src/9/port/devdup.c",
 	"//sys/src/9/port/devenv.c",
-	"//sys/src/9/port/devether.c",
 	"//sys/src/9/port/devfdmux.c",
 	"//sys/src/9/port/devkprof.c",
 	"//sys/src/9/port/devkbin.c",
@@ -78,6 +79,7 @@ PORT_SRCS = [
 	"//sys/src/9/port/devtab.c",
 	"//sys/src/9/port/devtrace.c",
 	"//sys/src/9/port/devuart.c",
+	"//sys/src/9/port/devvcon.c",
 	"//sys/src/9/port/devwd.c",
 	"//sys/src/9/port/devws.c",
 	"//sys/src/9/port/edf.c",
@@ -320,6 +322,7 @@ config(
 	dev=[
 		"acpi",
 		"arch",
+		"bridge",
 		"cap",
 		"cons",
 		"coreboot",
@@ -337,6 +340,7 @@ config(
 		"pci",
 		"pipe",
 		"proc",
+		"ram",
 		"regress",
 		"root",
 		"rtc",
@@ -348,6 +352,7 @@ config(
 		"uart",
 		"ws",
 		"usb",
+		"vcon",
 		"vga",
 	],
 	ip=[