From 87372eaac5016220e2d5ae1654f0409b4d5e11aa Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 26 Oct 2018 07:14:24 +0200 Subject: [PATCH] Makefile: Fix jailhouse-remote-deploy and add memguard-test to deploy target --- build/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Makefile b/build/Makefile index 169d90f..0151c07 100644 --- a/build/Makefile +++ b/build/Makefile @@ -38,7 +38,7 @@ jailhouse-install: FORCE # Hostname 192.168.1.54 INSTALL_HOST ?= root@tx2 -jailhouse-install-remote: JAILHOUSE_DESTDIR=jailhouse-install +jailhouse-install-remote: DESTDIR=jailhouse-install jailhouse-install-remote: jailhouse-install rsync -rlptD jailhouse-install/ $(INSTALL_HOST):/ rsync -rlptD rootfs-overlay/lib/modules/ $(INSTALL_HOST):/lib/modules @@ -66,15 +66,15 @@ modules_install: kernel-4.4/vmlinux .PHONY: FORCE -../test/prem-test: FORCE +../test/prem-test ../test/memguard-test: FORCE $(MAKE) -C ../test clean: rm -rf buildroot/images/rootfs.cpio.uboot kernel-4.4/vmlinux buildroot/target `find buildroot/ -name .stamp_target_installed` jailhouse-install -deploy: ../test/prem-test +deploy: ../test/prem-test ../test/memguard-test #deploy: ../jailhouse/hypervisor/jailhouse.bin - scp ../test/prem-test tx2:/bin + scp ../test/prem-test ../test/memguard-test tx2:/bin # scp ../jailhouse/hypervisor/jailhouse.bin tx2:/lib/firmware ssh tx2 'sh /etc/init.d/S20jailhouse.sh stop && sh /etc/init.d/S20jailhouse.sh start' -- 2.39.2