commit bc98358f5f9ac17e8f7a470a7550bb7b2e273df9
author Alex Van Damme <atv@google.com> Tue Sep 25 15:29:20 2018 -0700
committer Alex Van Damme <atv@google.com> Tue Sep 25 15:45:46 2018 -0700
tree 7e8f7375e3a3b9a3e9db7ae11c86feb134333f02
parent 956aeaabf41c5f69b39b31d0534b22a7b4eb5af7

Insert/remove qemu-aarch64-static during rootfs patching

Change-Id: Ib1a33443bd54ab1066202536cf7a660a97442fae

rootfs.mk

diff --git a/rootfs.mk b/rootfs.mk
index b3cc3b5..a7bf78b 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -87,7 +87,9 @@
                        $(ROOTDIR)/board/fstab.emmc \
                        $(ROOTDIR)/build/boot.mk \
                        $(ROOTDIR)/cache/packages.tgz \
-                       | $(PRODUCT_OUT)/boot.img
+                       kernel-deb \
+                       | $(PRODUCT_OUT)/boot.img \
+                         /usr/bin/qemu-aarch64-static
 	cp $(ROOTFS_RAW_IMG) $(ROOTFS_PATCHED_IMG).wip
 	mkdir -p $(ROOTFS_DIR)
 	-sudo umount $(ROOTFS_DIR)/boot
@@ -95,6 +97,7 @@
 	sudo mount -o loop $(ROOTFS_PATCHED_IMG).wip $(ROOTFS_DIR)
 	sudo mount -o loop $(PRODUCT_OUT)/boot.img $(ROOTFS_DIR)/boot
 	sudo mount -o bind /dev $(ROOTFS_DIR)/dev
+	sudo cp /usr/bin/qemu-aarch64-static $(ROOTFS_DIR)/usr/bin
 
 	sudo cp $(ROOTDIR)/board/fstab.emmc $(ROOTFS_DIR)/etc/fstab
 
@@ -115,6 +118,7 @@
 
 	+make -f $(ROOTDIR)/build/rootfs.mk adjustments
 
+	sudo rm -f $(ROOTFS_DIR)/usr/bin/qemu-aarch64-static
 	sudo umount $(ROOTFS_DIR)/dev
 	sudo umount $(ROOTFS_DIR)/boot
 	sudo umount $(ROOTFS_DIR)