Remove PACKAGES_FETCH_ROOT_DIRECTORY and friends

- Packages live in Apt now, so there's no reason to carry around this
legacy bit. It also is tough for external builds, as without a complete
packages.tgz to start with, you were unable to build.
- This changes the fallback logic for when a package is missing to
simply create the stamp file, and then the rootfs process will get the
package from apt. For this reason, there's no need to guard packages
with IS_EXTERNAL, either.

Change-Id: I490098f722cb5cf06b7373c8f26821b49e3b4de6
diff --git a/docker.mk b/docker.mk
index 66fabf1..7d013ce 100644
--- a/docker.mk
+++ b/docker.mk
@@ -47,7 +47,6 @@
 		-v $(PREBUILT_DOCKER_ROOT)\:/docker \
 		-v $(PREBUILT_MODULES_ROOT)\:/modules \
 		-v $(FETCH_PBUILDER_DIRECTORY)\:/pbuilder \
-		-v $(PACKAGES_FETCH_ROOT_DIRECTORY)\:/packages \
 		-w /rootdir \
 		-e "ROOTFS_FETCH_TARBALL=$(ROOTFS_FETCH_TARBALL)" \
 		-e "FETCH_PBUILDER_BASE=$(FETCH_PBUILDER_BASE)" \
@@ -56,9 +55,7 @@
 		-e "ROOTFS_REVISION=$(ROOTFS_REVISION)" \
 		-e "PREBUILT_MODULES_ROOT=/modules" \
 		-e "FETCH_PBUILDER_DIRECTORY=/pbuilder" \
-		-e "PACKAGES_FETCH_ROOT_DIRECTORY=/packages" \
 		-e "FETCH_PACKAGES=$(FETCH_PACKAGES)" \
-		-e "PACKAGES_REVISION=$(PACKAGES_REVISION)" \
 		-e "HEADLESS_BUILD=$(HEADLESS_BUILD)" \
 		-e "IS_EXTERNAL=$(IS_EXTERNAL)" \
 		-e "http_proxy=$(http_proxy)" \
diff --git a/kokoro/build.sh b/kokoro/build.sh
index 6c4c95b..a618501 100644
--- a/kokoro/build.sh
+++ b/kokoro/build.sh
@@ -27,8 +27,6 @@
 export PREBUILT_MODULES_ROOT=${KOKORO_GFILE_DIR}
 export PREBUILT_DOCKER_ROOT=${KOKORO_GFILE_DIR}
 export FETCH_PBUILDER_DIRECTORY=${KOKORO_GFILE_DIR}
-export PACKAGES_FETCH_ROOT_DIRECTORY=${KOKORO_GFILE_DIR}
-export PACKAGES_REVISION=.
 export ROOTFS_REVISION=.
 export FETCH_PACKAGES=false
 
diff --git a/kokoro/packages.sh b/kokoro/packages.sh
index 8734cf7..cc08772 100644
--- a/kokoro/packages.sh
+++ b/kokoro/packages.sh
@@ -17,8 +17,6 @@
 export PREBUILT_MODULES_ROOT=${KOKORO_GFILE_DIR}
 export PREBUILT_DOCKER_ROOT=${KOKORO_GFILE_DIR}
 export FETCH_PBUILDER_DIRECTORY=${KOKORO_GFILE_DIR}
-export PACKAGES_FETCH_ROOT_DIRECTORY=${KOKORO_GFILE_DIR}
-export PACKAGES_REVISION=.
 export ROOTFS_REVISION=.
 export FETCH_PACKAGES=false
 
diff --git a/packages.mk b/packages.mk
index f1fd191..9a57ef2 100644
--- a/packages.mk
+++ b/packages.mk
@@ -61,6 +61,8 @@
 $1: $(PRODUCT_OUT)/.$1-pbuilder-$(USERSPACE_ARCH)
 PBUILDER_TARGETS += $(PRODUCT_OUT)/.$1-pbuilder-$(USERSPACE_ARCH)
 
+# If we don't have the source for a package for some reason, don't panic.
+# Just set the pbuilder stamp, and it will come from apt.
 ifneq (,$(wildcard $(ROOTDIR)/packages/$1))
 $(PRODUCT_OUT)/.$1-pbuilder-$(USERSPACE_ARCH): \
 	$(foreach package,$3,$(PRODUCT_OUT)/.$(package)-pbuilder-$(USERSPACE_ARCH)) \
@@ -97,15 +99,7 @@
 		--host-arch $(USERSPACE_ARCH) --logfile $(PRODUCT_OUT)/$1-$(USERSPACE_ARCH).log
 	$(LOG) $1 finished
 else
-$(PRODUCT_OUT)/.$1-pbuilder-$(USERSPACE_ARCH): \
-	| out-dirs \
-	$(PACKAGES_FETCH_ROOT_DIRECTORY)/$(PACKAGES_REVISION)/packages.tgz
-	$(LOG) $1 pbuilder extract
-	tar -C $(PRODUCT_OUT) --wildcards -xf \
-		$(PACKAGES_FETCH_ROOT_DIRECTORY)/$(PACKAGES_REVISION)/packages.tgz \
-		packages/$1*.deb
-	$(ROOTDIR)/build/update_packages.sh
-	$(LOG) $1 finished
+$(PRODUCT_OUT)/.$1-pbuilder-$(USERSPACE_ARCH): | out-dirs
 endif
 	touch $(PRODUCT_OUT)/.$1-pbuilder-$(USERSPACE_ARCH)
 .PHONY:: $1
@@ -120,10 +114,7 @@
 $(eval $(call make-pbuilder-package-target,aiy-board-keyring,packages/aiy-board-keyring))
 $(eval $(call make-pbuilder-package-target,aiy-board-tweaks,packages/aiy-board-tweaks))
 $(eval $(call make-pbuilder-package-target,base-files,packages/base-files))
-
-ifeq ($(IS_EXTERNAL),)
 $(eval $(call make-pbuilder-package-target,edgetpu-api,packages/edgetpu-api,,,binary))
-endif
 
 include $(ROOTDIR)/board/packages.mk
 
diff --git a/preamble.mk b/preamble.mk
index 3f853a4..e3f30dc 100644
--- a/preamble.mk
+++ b/preamble.mk
@@ -23,8 +23,6 @@
     ROOTFS_FETCH_TARBALL := false
     DEBOOTSTRAP_FETCH_TARBALL := false
     FETCH_PACKAGES := false
-    PACKAGES_FETCH_ROOT_DIRECTORY := $(ROOTDIR)/cache
-    PACKAGES_REVISION := .
 endif
 
 ifneq (,$(wildcard /etc/dpkg/origins/glinux))
@@ -153,8 +151,6 @@
 PREBUILT_DOCKER_ROOT ?= /google/data/ro/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/docker
 
 FETCH_PACKAGES ?= $(IS_GLINUX)
-PACKAGES_REVISION ?= latest
-PACKAGES_FETCH_ROOT_DIRECTORY ?= /google/data/ro/teams/spacepark/enterprise/kokoro/prod/spacepark/enterprise/continuous
 
 BOOT_SIZE_MB := 128
-ROOTFS_SIZE_MB := 4096
\ No newline at end of file
+ROOTFS_SIZE_MB := 4096