rootfs: Fix dependencies to rebuild properly
The original rootfs targets weren't depending on the makefiles or the tarball,
so if the tarball was regenerated, the rootfs would remain unchanged.
Change-Id: Iecfa9f934fb73c9b4b331a94b1fa2441e202f223
diff --git a/debootstrap.mk b/debootstrap.mk
index d4a5cb2..61d6d4d 100644
--- a/debootstrap.mk
+++ b/debootstrap.mk
@@ -28,7 +28,7 @@
cd $(ROOTDIR)/cache && \
sha256sum $(notdir $(DEBOOTSTRAP_TARBALL)) > $(DEBOOTSTRAP_TARBALL_SHA256)
-make-bootstrap-tarball: $(ROOTDIR)/build/debootstrap.mk
+make-bootstrap-tarball: $(ROOTDIR)/build/debootstrap.mk $(ROOTDIR)/build/preamble.mk
mkdir -p $(PRODUCT_OUT)/obj/DEBOOTSTRAP
mkdir -p $(ROOTDIR)/cache
debootstrap \
diff --git a/rootfs.mk b/rootfs.mk
index e871c50..1e59dbe 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -64,10 +64,11 @@
sudo $(ROOTDIR)/build/fix_permissions.sh -p $(ROOTDIR)/build/permissions.txt -t $(ROOTFS_DIR)
sudo umount -R $(ROOTFS_DIR)/{dev,proc,sys}
-$(ROOTFS_RAW_IMG):
+$(ROOTFS_RAW_IMG): $(DEBOOTSTRAP_TARBALL) $(ROOTDIR)/build/debootstrap.mk $(ROOTDIR)/build/preamble.mk
+make -f $(ROOTDIR)/build/debootstrap.mk validate-bootstrap-tarball
mkdir -p $(ROOTFS_DIR)
+ rm -f $(ROOTFS_RAW_IMG)
fallocate -l 2G $(ROOTFS_RAW_IMG)
mkfs.ext4 -j $(ROOTFS_RAW_IMG)
tune2fs -o discard $(ROOTFS_RAW_IMG)
