Move multistrap conf to board/
Change-Id: I6b3db81ac4b3aa334e3d036189ec773bbd48deb1
diff --git a/multistrap.conf b/multistrap.conf
deleted file mode 100644
index e36872f..0000000
--- a/multistrap.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[General]
-arch=USERSPACE_ARCH
-cleanup=true
-unpack=true
-bootstrap=main non-free contrib
-aptsources=main non-free contrib
-noauth=true
-
-[main]
-packages=MAIN_PACKAGES
-source=https://packages.cloud.google.com/apt
-suite=aiy-debian-stretch-main-20180923-1
-
-[non-free]
-packages=
-source=https://packages.cloud.google.com/apt
-suite=aiy-debian-stretch-non-free-20180918-1
-
-[contrib]
-packages=
-source=https://packages.cloud.google.com/apt
-suite=aiy-debian-stretch-contrib-20180918-1
diff --git a/rootfs.mk b/rootfs.mk
index 8f3a539..96ff62b 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -105,7 +105,7 @@
-sudo umount $(ROOTFS_DIR)/dev
-sudo umount $(ROOTFS_DIR)
sudo mount -o loop $(ROOTFS_RAW_IMG) $(ROOTFS_DIR)
- cp $(ROOTDIR)/build/multistrap.conf $(PRODUCT_OUT)
+ cp $(ROOTDIR)/board/multistrap.conf $(PRODUCT_OUT)
sed -i -e 's/MAIN_PACKAGES/$(PACKAGES_EXTRA)/g' $(PRODUCT_OUT)/multistrap.conf
sed -i -e 's/USERSPACE_ARCH/$(USERSPACE_ARCH)/g' $(PRODUCT_OUT)/multistrap.conf
$(LOG) rootfs raw-build multistrap
