commit 5bce1cf87dc71738f6bbd3bc7acddef050826d97
author Alex Van Damme <atv@google.com> Mon Jul 02 17:24:18 2018 -0700
committer Alex Van Damme <atv@google.com> Mon Jul 02 17:25:24 2018 -0700
tree 226d069dcfe5f159f20edafed575e989f7e5170a
parent 289b8cbdc7fb48ec9d4b5c7b8bb4a893bf2e0aae

Debootstrap cache fixup

- The dependencies here were funny, and so debootstrap.tgz was always
copying. Don't copy it unless the one in x20 is newer.

Change-Id: I0179f42381611e72547e0e55586e77287045f489

debootstrap.mk

diff --git a/debootstrap.mk b/debootstrap.mk
index 0aa21f2..4897f44 100644
--- a/debootstrap.mk
+++ b/debootstrap.mk
@@ -7,20 +7,15 @@
 DEBOOTSTRAP_TARBALL_REVISION ?= latest
 DEBOOTSTRAP_FETCH_TARBALL ?= true
 
-ifeq ($(DEBOOTSTRAP_FETCH_TARBALL),true)
-validate-bootstrap-tarball: fetch-bootstrap-tarball
-else
 validate-bootstrap-tarball: $(DEBOOTSTRAP_TARBALL)
-endif
 	cd $(ROOTDIR)/cache && \
 		sha256sum -c $(DEBOOTSTRAP_TARBALL_SHA256)
 
-fetch-bootstrap-tarball: $(TARBALL_FETCH_ROOT_DIRECTORY)/$(DEBOOTSTRAP_TARBALL_REVISION)/debootstrap.tgz
+ifeq ($(DEBOOTSTRAP_FETCH_TARBALL),true)
+$(DEBOOTSTRAP_TARBALL): $(TARBALL_FETCH_ROOT_DIRECTORY)/$(DEBOOTSTRAP_TARBALL_REVISION)/debootstrap.tgz
 	mkdir -p $(ROOTDIR)/cache
 	cp $< $<.sha256sum $(ROOTDIR)/cache
-
-make-bootstrap-tarball: $(DEBOOTSTRAP_TARBALL)
-
+else
 $(DEBOOTSTRAP_TARBALL): $(ROOTDIR)/build/debootstrap.mk $(ROOTDIR)/build/preamble.mk
 	mkdir -p $(PRODUCT_OUT)/obj/DEBOOTSTRAP
 	mkdir -p $(ROOTDIR)/cache
@@ -30,6 +25,7 @@
 		--make-tarball=$(DEBOOTSTRAP_TARBALL) \
 		stretch $(PRODUCT_OUT)/obj/DEBOOTSTRAP
 	+make -f $(ROOTDIR)/build/debootstrap.mk make-bootstrap-sha256sum
+endif
 
 make-bootstrap-sha256sum: $(DEBOOTSTRAP_TARBALL)
 	cd $(ROOTDIR)/cache && \
@@ -43,4 +39,4 @@
 clean::
 	sudo rm -rf $(PRODUCT_OUT)/obj/DEBOOTSTRAP
 
-.PHONY:: fetch-bootstrap-tarball validate-bootstrap-tarball make-bootstrap-sha256sum make-bootstrap-tarball
+.PHONY:: validate-bootstrap-tarball make-bootstrap-sha256sum make-bootstrap-tarball