Stop using packages.tgz to get prebuilt packages
- Packages are now in apt repositories, so stop trying to get
packages.tgz from the previous continuous build if a user wants prebuilt
packages, simply fetching from apt instead. In the case of building
packages locally, we do still follow the same process as always.
- Also remove exporting of packages.tgz from several Kokoro builds, as
the artifact will no longer see any use.
Change-Id: I68be5a70bc47707498ec30fe6e1731256caaea73
diff --git a/kokoro/alpha.cfg b/kokoro/alpha.cfg
index 3c14c01..2325d7c 100644
--- a/kokoro/alpha.cfg
+++ b/kokoro/alpha.cfg
@@ -12,6 +12,5 @@
regex: "partition-table-*.img"
regex: "rootfs.img"
regex: "u-boot.imx"
- regex: "packages.tgz"
}
}
diff --git a/kokoro/alpha.sh b/kokoro/alpha.sh
index 7a9690c..d4759f1 100644
--- a/kokoro/alpha.sh
+++ b/kokoro/alpha.sh
@@ -42,4 +42,3 @@
cp ${PRODUCT_OUT}/partition-table-*.img ${KOKORO_ARTIFACTS_DIR}
cp ${PRODUCT_OUT}/rootfs.img ${KOKORO_ARTIFACTS_DIR}
cp ${PRODUCT_OUT}/sdcard.img ${KOKORO_ARTIFACTS_DIR}
-cp ${ROOTDIR}/cache/packages.tgz $KOKORO_ARTIFACTS_DIR
diff --git a/kokoro/continuous.cfg b/kokoro/continuous.cfg
index 368601d..8533a30 100644
--- a/kokoro/continuous.cfg
+++ b/kokoro/continuous.cfg
@@ -12,6 +12,5 @@
regex: "partition-table-*.img"
regex: "rootfs.img"
regex: "u-boot.imx"
- regex: "packages.tgz"
}
}
diff --git a/kokoro/continuous.sh b/kokoro/continuous.sh
index 7a9690c..d4759f1 100644
--- a/kokoro/continuous.sh
+++ b/kokoro/continuous.sh
@@ -42,4 +42,3 @@
cp ${PRODUCT_OUT}/partition-table-*.img ${KOKORO_ARTIFACTS_DIR}
cp ${PRODUCT_OUT}/rootfs.img ${KOKORO_ARTIFACTS_DIR}
cp ${PRODUCT_OUT}/sdcard.img ${KOKORO_ARTIFACTS_DIR}
-cp ${ROOTDIR}/cache/packages.tgz $KOKORO_ARTIFACTS_DIR
diff --git a/kokoro/headless.cfg b/kokoro/headless.cfg
index 54fb4e2..478ab3e 100644
--- a/kokoro/headless.cfg
+++ b/kokoro/headless.cfg
@@ -12,6 +12,5 @@
regex: "partition-table-*.img"
regex: "rootfs.img"
regex: "u-boot.imx"
- regex: "packages.tgz"
}
}
diff --git a/kokoro/headless.sh b/kokoro/headless.sh
index 38cdd5f..9897b70 100644
--- a/kokoro/headless.sh
+++ b/kokoro/headless.sh
@@ -39,4 +39,3 @@
cp ${PRODUCT_OUT}/partition-table-*.img ${KOKORO_ARTIFACTS_DIR}
cp ${PRODUCT_OUT}/rootfs.img ${KOKORO_ARTIFACTS_DIR}
cp ${PRODUCT_OUT}/sdcard.img ${KOKORO_ARTIFACTS_DIR}
-cp ${ROOTDIR}/cache/packages.tgz $KOKORO_ARTIFACTS_DIR
diff --git a/packages.mk b/packages.mk
index 82b5a24..67ef924 100644
--- a/packages.mk
+++ b/packages.mk
@@ -129,18 +129,9 @@
ALL_PACKAGE_TARGETS := $(PBUILDER_TARGETS)
packages-tarball: $(ROOTDIR)/cache/packages.tgz
-$(info )
-ifeq ($(FETCH_PACKAGES),true)
-$(info Using prebuilt packages, set FETCH_PACKAGES=false to build locally)
-$(ROOTDIR)/cache/packages.tgz: $(PACKAGES_FETCH_ROOT_DIRECTORY)/$(ROOTFS_REVISION)/packages.tgz | out-dirs
- cp $< $(ROOTDIR)/cache
-else
-$(info Building packages locally, set FETCH_PACKAGES=true to use prebuilts)
$(ROOTDIR)/cache/packages.tgz: $(ALL_PACKAGE_TARGETS) | out-dirs
$(ROOTDIR)/build/update_packages.sh
tar -C $(PRODUCT_OUT) -czf $@ packages
-endif
-$(info )
packages:: $(ALL_PACKAGE_TARGETS)
diff --git a/rootfs.mk b/rootfs.mk
index 7b5a9f0..9bcab6f 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -60,6 +60,13 @@
PRE_INSTALL_PACKAGES := $(BASE_PACKAGES) $(BSP_BASE_PACKAGES)
endif
+ifeq ($(FETCH_PACKAGES),true)
+ $(info *** Using prebuilt packages, set FETCH_PACKAGES=false to build locally)
+else
+ $(info *** Building packages locally, set FETCH_PACKAGES=true to use prebuilts)
+endif
+
+
rootfs: $(PRODUCT_OUT)/rootfs.img
$(LOG) rootfs finished
@@ -118,10 +125,15 @@
$(LOG) rootfs raw-build finished
endif
-$(ROOTFS_PATCHED_IMG): $(ROOTFS_RAW_IMG) \
+ROOTFS_PATCHED_DEPS := $(ROOTFS_RAW_IMG) \
$(ROOTDIR)/board/fstab.emmc \
- $(ROOTDIR)/build/boot.mk \
- $(ROOTDIR)/cache/packages.tgz \
+ $(ROOTDIR)/build/boot.mk
+
+ifeq ($(FETCH_PACKAGES),false)
+ ROOTFS_PATCHED_DEPS += $(ROOTDIR)/cache/packages.tgz
+endif
+
+$(ROOTFS_PATCHED_IMG): $(ROOTFS_PATCHED_DEPS) \
| $(PRODUCT_OUT)/boot.img \
/usr/bin/qemu-$(QEMU_ARCH)-static
$(LOG) rootfs patch
@@ -140,12 +152,14 @@
$(LOG) rootfs patch keyring
echo 'nameserver 8.8.8.8' | sudo tee $(ROOTFS_DIR)/etc/resolv.conf
+ifeq ($(FETCH_PACKAGES),false)
echo 'deb [trusted=yes] file:///opt/aiy/packages ./' | sudo tee $(ROOTFS_DIR)/etc/apt/sources.list.d/local.list
sudo mkdir -p $(ROOTFS_DIR)/opt/aiy
sudo tar -xvf $(ROOTDIR)/cache/packages.tgz -C $(ROOTFS_DIR)/opt/aiy/
+endif
sudo cp $(ROOTDIR)/build/99network-settings $(ROOTFS_DIR)/etc/apt/apt.conf.d/
sudo chroot $(ROOTFS_DIR) bash -c 'apt-get update'
- sudo chroot $(ROOTFS_DIR) bash -c 'apt-get install aiy-board-keyring'
+ sudo chroot $(ROOTFS_DIR) bash -c 'apt-get install -y --allow-unauthenticated aiy-board-keyring'
sudo chroot $(ROOTFS_DIR) bash -c 'apt-get update'
$(LOG) rootfs patch keyring finished
