Browse Source

more adjustments to build scripts

Signed-off-by: John Floren <john.floren@gravwell.io>
John Floren 2 years ago
parent
commit
7b21f013d3
4 changed files with 13 additions and 9 deletions
  1. 3 3
      build/build-usb.bash
  2. 3 3
      build/build.bash
  3. 1 3
      build/scripts/build
  4. 6 0
      dist/replica/plan9.proto

+ 3 - 3
build/build-usb.bash

@@ -11,13 +11,13 @@ if [ ! -e 9legacy.iso ]; then
 fi
 
 # Get the Go program source fetched
-$(cd ../sys/src/cmd/go && sh fetchrepos.sh)
+(cd ../sys/src/cmd/go && sh fetchrepos.sh)
 
 # Make directories as needed
-$(cd ..; bash ./build/mkdirs)
+(cd ..; bash ./build/mkdirs)
 
 rm -f harvey.tgz
-$(cd ..; tar --format ustar --exclude './build' --exclude harvey.tgz --exclude .git --exclude '9legacy.iso*' -czf harvey.tgz *)
+(cd ..; tar --format ustar --exclude './build' --exclude harvey.tgz --exclude .git --exclude '9legacy.iso*' -czf harvey.tgz *)
 
 expect <<EOF
 spawn qemu-system-i386 -accel kvm -nographic -net user -net nic,model=virtio -m 4096 -vga none -cdrom 9legacy.iso -boot d -hda ../harvey.tgz

+ 3 - 3
build/build.bash

@@ -11,13 +11,13 @@ if [ ! -e 9legacy.iso ]; then
 fi
 
 # Get the Go program source fetched
-$(cd ../sys/src/cmd/go && sh fetchrepos.sh)
+(cd ../sys/src/cmd/go && sh fetchrepos.sh)
 
 # Make directories as needed
-$(cd ..; bash ./build/mkdirs)
+(cd ..; bash ./build/mkdirs)
 
 rm -f harvey.tgz
-$(cd ..; tar --format ustar --exclude './build' --exclude harvey.tgz --exclude .git --exclude '9legacy.iso*' -czf harvey.tgz *)
+(cd ..; tar --format ustar --exclude './build' --exclude harvey.tgz --exclude .git --exclude '9legacy.iso*' -czf harvey.tgz *)
 
 expect <<EOF
 spawn qemu-system-i386 -accel kvm -nographic -net user -net nic,model=virtio -m 4096 -vga none -cdrom 9legacy.iso -boot d -hda ../harvey.tgz

+ 1 - 3
build/scripts/build

@@ -158,11 +158,9 @@ echo IN /sys/lib/dist/pc
 ls -l
 cd /sys/src/9/pc && mk nuke
 
-cd /sys/src/ && mk nuke
+cd /sys/src/cmd && mk nuke
 
 # man
 
 cd /sys/lib/man/lookman && mk index
 cd /sys/man && mk
-
-echo DONEZO

+ 6 - 0
dist/replica/plan9.proto

@@ -35,6 +35,8 @@ amd64	d775 sys sys
 	+	d775 sys sys
 arm	d775 sys sys
 	+	d775 sys sys
+arm64	d775 sys sys
+	+	d775 sys sys
 mips	d775 sys sys
 	+	d775 sys sys
 mips64	d775 sys sys
@@ -43,6 +45,10 @@ power	d775 sys sys
 	+	d775 sys sys
 power64	d775 sys sys
 	+	d775 sys sys
+riscv	d775 sys sys
+	+	d775 sys sys
+riscv64	d775 sys sys
+	+	d775 sys sys
 sparc	d775 sys sys
 	+	d775 sys sys
 spim	d775 sys sys