Revert "Restructured Enclave Build Process (introducing vault.sh) (#96)"

This reverts commit 6708b22.

.travis.yml

@@ -14,7 +14,7 @@ git:
   depth: 1
 
 env:
-  - RISCV=$TRAVIS_BUILD_DIR/riscv PATH=$PATH:$RISCV/bin KEYSTONE_SDK_DIR=$TRAVIS_BUILD_DIR/sdk
+  - RISCV=$TRAVIS_BUILD_DIR/riscv PATH=$PATH:$RISCV/bin
 
 addons:
   apt:
@@ -52,7 +52,6 @@ addons:
     - libglib2.0-dev
     - libpixman-1-dev
     - libssl-dev
-    - makeself
 
 branches:
   only:
@@ -80,6 +79,10 @@ jobs:
         - source ./source.sh
         - travis_wait 120 make -j2
         - travis_wait 10 ./scripts/travis.sh
+        - cd sdk; make clean; OPTIONS_FLAGS="" make
+        - cd ..
+        - make
+        - travis_wait 10 ./scripts/travis.sh
         - cd riscv-qemu; git clean -fxd > /dev/null;git reset --hard > /dev/null;rm -rf .git;mv ../riscv-qemu-git  .git;cd ..
         - cd riscv-linux;git clean -fxd > /dev/null;git reset --hard > /dev/null;rm -rf .git;mv ../riscv-linux-git .git;cd ..
       after_failure:

Makefile

@@ -1,4 +1,5 @@
 BOOTROM_DIR=bootrom
+SDK_DIR=sdk
 QEMU_DIR=riscv-qemu
 
 BOOTROM=$(BOOTROM_DIR)/bootrom.elf
@@ -12,12 +13,17 @@ all: hifive
 qemu:
 	./scripts/run-qemu.sh
 
+
 .PHONY: hifive
-hifive: $(QEMU) $(BOOTROM)
+hifive: sdk $(QEMU) $(BOOTROM)
 	$(MAKE) -f hifive.mk
 	$(MAKE) -C hifive-work/buildroot_initramfs
 	$(MAKE) -f hifive.mk
 
+.PHONY: sdk
+sdk:
+	$(MAKE) -C $(SDK_DIR)
+
 $(QEMU):
 	./scripts/apply-patch.sh
 	cd $(QEMU_DIR); ./configure --target-list=riscv64-softmmu,riscv32-softmmu;

fast-setup.sh

@@ -28,10 +28,4 @@ else
 fi
 
 git config --global submodule.riscv-gnu-toolchain.update none
-git submodule sync --recursive
 git submodule update --init --recursive
-
-# build tests in SDK
-make -C sdk
-./sdk/scripts/init.sh --runtime eyrie --force
-./sdk/examples/tests/vault.sh

hifive-conf/buildroot_initramfs_config

@@ -4,6 +4,7 @@ BR2_RISCV_64=y
 BR2_RISCV_g=y
 BR2_RISCV_ABI_LP64D=y
 BR2_JLEVEL=2
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/keystone/br_copy_bins.sh"
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(RISCV)"
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu"
@@ -41,4 +42,3 @@ BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_SCREEN=y
 BR2_PACKAGE_HTOP=y
-BR2_ROOTFS_OVERLAY="../buildroot_overlay"

hifive.mk

@@ -19,7 +19,6 @@ buildroot_initramfs_sysroot := $(wrkdir)/buildroot_initramfs_sysroot
 buildroot_rootfs_wrkdir := $(wrkdir)/buildroot_rootfs
 buildroot_rootfs_ext := $(buildroot_rootfs_wrkdir)/images/rootfs.ext4
 buildroot_rootfs_config := $(confdir)/buildroot_rootfs_config
-buildroot_rootfs_overlay_dir := $(srcdir)/buildroot_overlay
 
 linux_srcdir := $(srcdir)/riscv-linux
 linux_wrkdir := $(wrkdir)/hifive-linux
@@ -66,8 +65,7 @@ all: $(hex) $(vmlinux) $(linux_module)
 	@echo "  ... you will need gdisk and e2fsprogs installed"
 	@echo
 
-
-$(buildroot_initramfs_wrkdir)/.config: $(buildroot_srcdir) $(buildroot_rootfs_overlay_dir)/.dirstamp
+$(buildroot_initramfs_wrkdir)/.config: $(buildroot_srcdir)
 	rm -rf $(dir $@)
 	mkdir -p $(dir $@)
 	cp $(buildroot_initramfs_config) $@
@@ -82,7 +80,7 @@ buildroot_initramfs-menuconfig: $(buildroot_initramfs_wrkdir)/.config $(buildroo
 	$(MAKE) -C $(dir $<) O=$(buildroot_initramfs_wrkdir) savedefconfig
 	cp $(dir $<)/defconfig $(confdir)/buildroot_initramfs_config
 
-$(buildroot_rootfs_wrkdir)/.config: $(buildroot_srcdir) $(buildroot_rootfs_overlay_dir)/.dirstamp
+$(buildroot_rootfs_wrkdir)/.config: $(buildroot_srcdir)
 	rm -rf $(dir $@)
 	mkdir -p $(dir $@)
 	cp $(buildroot_rootfs_config) $@
@@ -128,10 +126,6 @@ $(vmlinux): $(linux_srcdir) $(linux_wrkdir)/.config $(buildroot_initramfs_sysroo
 		ARCH=riscv \
 		vmlinux
 
-$(buildroot_rootfs_overlay_dir)/.dirstamp:
-	mkdir -p $(buildroot_rootfs_overlay_dir)
-	touch $@
-
 $(linux_module): $(vmlinux)
 	rm -rf $(linux_module_wrkdir)
 	mkdir -p $(linux_module_wrkdir)
@@ -141,8 +135,7 @@ $(linux_module): $(vmlinux)
 		ARCH=riscv \
 		M=$(linux_module_wrkdir) \
 		modules
-	mkdir -p $(buildroot_rootfs_overlay_dir)/root
-	cp $(linux_module) $(buildroot_rootfs_overlay_dir)/root
+	cp $(linux_module) $(buildroot_initramfs_wrkdir)/target/root/
 
 $(vmlinux_stripped): $(vmlinux)
 	$(target)-strip -o $@ $<

scripts/test-qemu.sh

@@ -10,6 +10,6 @@ expect "yes/no" {
 log_file -noappend  output.log
 
 expect "# " { send "insmod keystone-driver.ko\r" }
-expect "# " { send "cd tests; ./tests.ke\r" }
+expect "# " { send "./test\r" }
 expect "# " { send "poweroff\r" }
 expect eof

setup.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-git submodule sync --recursive
 git submodule update --init --recursive
 
 mkdir riscv
@@ -10,8 +9,3 @@ cd riscv-gnu-toolchain
 ./configure --prefix=$RISCV
 make && make linux
 cd ..
-
-# build tests in SDK
-make -C sdk
-./sdk/scripts/init.sh --runtime eyrie --force
-./sdk/examples/tests/vault.sh

tests/test-qemu.expected.log

@@ -1,8 +1,6 @@
 
 # insmod keystone-driver.ko
-# cd tests; ./tests.ke
-Verifying archive integrity... All good.
-Uncompressing Keystone vault archive
+# ./test
 testing stack
 testing fibonacci
 testing long-nop