add more system files to uroot.cpio

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>

go.sum

@@ -34,6 +34,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/u-root/u-root v6.0.1-0.20200728234108-3441aaa6cf0c+incompatible h1:vRAKYyEfhZV7SDTcaE3Cuop7tjDMOrapnBb59wVCcyE=
 github.com/u-root/u-root v6.0.1-0.20200728234108-3441aaa6cf0c+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
+github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
 github.com/u-root/u-root v7.0.1-0.20200915215200-c370a343c8b0+incompatible h1:72xpS/5zzWaJJSlPmvgUG4QCLFjCatyQMwKQ+xuyp+w=
 github.com/u-root/u-root v7.0.1-0.20200915215200-c370a343c8b0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
 github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=

sys/src/9/amd64/allbuild.json

@@ -0,0 +1,150 @@
+[
+	{
+		"Name": "cpu",
+		"Env": [
+			"CONF=cpu"
+		],
+		"Include": [
+			"core.json",
+			"../386/386.json",
+			"../ip/ip.json",
+			"../port/port.json"
+		],
+		"Projects": [
+			"gocmds.json",
+			"u-root.json"
+		],
+		"Kernel": {
+			"Config": {
+				"Code": [
+					"int cpuserver = 1;",
+					"uint32_t kerndate = 1;"
+				],
+				"#Dev": "devs are in order of initialisation",
+				"Dev": [
+					"uart",
+					"acpi",
+					"arch",
+					"bridge",
+					"cap",
+					"cons",
+					"draw",
+					"dup",
+					"env",
+					"fdmux",
+					"ether",
+					"ip",
+					"kbin",
+					"kbmap",
+					"kprof",
+					"mnt",
+					"mntn",
+					"mouse",
+					"pci",
+					"pipe",
+					"proc",
+					"ram",
+					"regress",
+					"root",
+					"rtc",
+					"sd",
+					"segment",
+					"srv",
+					"ssl",
+					"tls",
+					"usb",
+					"ws",
+					"v9p",
+					"vcon",
+					"vga"
+				],
+				"Ip": [
+					"tcp",
+					"udp",
+					"ipifc",
+					"icmp",
+					"icmp6",
+					"gre"
+				],
+				"Link": [
+					"ether8169",
+					"ether82557",
+					"ether82563",
+					"etherigbe",
+					"ether8139",
+					"ethermedium",
+					"loopbackmedium",
+					"netdevmedium",
+					"usbuhci",
+					"usbohci",
+					"usbehci"
+				],
+				"Sd": [
+					"sdiahci"
+				],
+				"Uart": [
+					"i8250",
+					"pci"
+				],
+				"VGA": [
+					"vganvidia",
+					"vgavesa"
+				]
+			},
+			"Ramfiles": {
+				"bind": "/$ARCH/bin/bind",
+				"boot": "/sys/src/9/boot/bootcpu.elf.out",
+				"cat": "/$ARCH/bin/cat",
+				"cpio": "/plan9_$ARCH/bin/cpio",
+				"crs": "/$ARCH/bin/acpi/crs",
+				"date": "/$ARCH/bin/date",
+				"decompress": "/plan9_$ARCH/bin/decompress",
+				"echo": "/$ARCH/bin/echo",
+				"ed": "/$ARCH/bin/ed",
+				"factotum": "/$ARCH/bin/auth/factotum",
+				"fdisk": "/$ARCH/bin/disk/fdisk",
+				"fossil": "/$ARCH/bin/fossil/fossil",
+				"grep": "/$ARCH/bin/grep",
+				"ipconfig": "/$ARCH/bin/ip/ipconfig",
+				"irq": "/$ARCH/bin/acpi/irq",
+				"ls": "/$ARCH/bin/ls",
+				"mount": "/$ARCH/bin/mount",
+				"nvram": "/util/nvram",
+				"pci": "/rc/bin/pci",
+				"prep": "/$ARCH/bin/disk/prep",
+				"ps": "/$ARCH/bin/ps",
+				"ratrace": "/$ARCH/bin/ratrace",
+				"rc": "/$ARCH/bin/rc",
+				"rcmain": "/rc/lib/rcmain",
+				"realemu": "/$ARCH/bin/aux/realemu",
+				"sed": "/$ARCH/bin/sed",
+				"srv": "/$ARCH/bin/srv",
+				"startdisk": "startdisk",
+				"tmpfs": "/plan9_$ARCH/bin/tmpfs",
+				"usbd": "/$ARCH/bin/usb/usbd",
+				"venti": "/$ARCH/bin/venti/venti",
+				"vga": "/$ARCH/bin/aux/vga",
+				"uroot": "uroot.cpio.lzma"
+			},
+			"Systab": "/sys/src/libc/9syscall/sys.h"
+		},
+		"Program": "harvey",
+		"SourceFiles": [
+			"cga.c",
+			"devacpi.c",
+			"devusb.c",
+			"devvga.c",
+			"ether8139.c",
+			"ether82563.c",
+			"cpu.c",
+			"mouse.c",
+			"screen.c",
+			"sdiahci.c",
+			"usbehcipc.c",
+			"usbohci.c",
+			"usbuhci.c",
+			"vga.c",
+			"vgax.c"
+		]
+	}
+]

sys/src/9/amd64/build.json

@@ -10,10 +10,6 @@
 			"../ip/ip.json",
 			"../port/port.json"
 		],
-		"Projects": [
-			"gocmds.json",
-			"u-root.json"
-		],
 		"Kernel": {
 			"Config": {
 				"Code": [
@@ -118,11 +114,9 @@
 				"sed": "/$ARCH/bin/sed",
 				"srv": "/$ARCH/bin/srv",
 				"startdisk": "startdisk",
-				"tmpfs": "/plan9_$ARCH/bin/tmpfs",
 				"usbd": "/$ARCH/bin/usb/usbd",
 				"venti": "/$ARCH/bin/venti/venti",
-				"vga": "/$ARCH/bin/aux/vga",
-				"uroot": "uroot.cpio.lzma"
+				"vga": "/$ARCH/bin/aux/vga"
 			},
 			"Systab": "/sys/src/libc/9syscall/sys.h"
 		},

sys/src/9/amd64/gocmds.json

@@ -7,7 +7,8 @@
 			"GOARCH=amd64"
 		],
 		"Pre": [
-			"go build -o /plan9_amd64/bin/tmpfs harvey-os.org/cmd/tmpfs"
+			"go build -o /plan9_amd64/bin/decompress harvey-os.org/cmd/decompress",
+			"go build -o /plan9_amd64/bin/cpio github.com/u-root/u-root/cmds/core/cpio"
 		]
 	}
 ]

sys/src/9/amd64/u-root.json

@@ -6,13 +6,9 @@
 			"GOOS=plan9",
 			"GOARCH=amd64"
 		],
-		"#Pre only do this when KZERO is 0xffffffff_80000000": [
-			"u-root -o uroot.cpio -files /amd64/bin:amd64/bin -files /rc/bin:rc/bin -files /lib/ndb:lib/ndb $UROOTEXTRARGS plan9 $UROOTEXTRAPACKAGES",
-			"lzma -f -k uroot.cpio"
-		],
 		"Pre": [
-			"u-root -o uroot.cpio plan9",
-			"lzma -f -k uroot.cpio"
+			"u-root -shellbang -initcmd= -o uroot.cpio -files /amd64/bin:amd64/bin -files /rc/bin:rc/bin -files /lib/ndb:lib/ndb $UROOTEXTRARGS plan9 $UROOTEXTRAPACKAGES",
+			"lzma -f -k -3 uroot.cpio"
 		]
 	}
 ]

sys/src/9/port/devroot.c

@@ -19,7 +19,7 @@ enum {
 	Qboot = 0x1000,
 
 	Nrootfiles = 32,
-	Nbootfiles = 32,
+	Nbootfiles = 64,
 };
 
 typedef struct Dirlist Dirlist;