Remove bsp repos from pbuilder base images
- Each board's BSP repo is inserted during its package builds by
pbuilder hook. Remove it from the generated base images to ensure we only
have th correct BSP repo during builds.
Change-Id: If62774a6dc8b598bf9d2e3ac63b4b44850279be2
diff --git a/packages.mk b/packages.mk
index 167a281..2ad9107 100644
--- a/packages.mk
+++ b/packages.mk
@@ -28,7 +28,7 @@
mkdir -p $(ROOTDIR)/cache
sudo pbuilder create \
--basetgz $@ \
- --othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main|deb [trusted=yes] http://packages.cloud.google.com/apt mendel-bsp-$(BOARD_NAME)-day main" \
+ --othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main" \
--distribution buster \
--architecture amd64 \
--extrapackages "crossbuild-essential-armhf crossbuild-essential-arm64 debhelper gnupg lintian qemu-user-static" \
@@ -43,7 +43,7 @@
mkdir -p $(ROOTDIR)/cache
sudo pbuilder create \
--basetgz $@ \
- --othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main|deb [trusted=yes] http://packages.cloud.google.com/apt mendel-bsp-$(BOARD_NAME)-day main" \
+ --othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main" \
--distribution buster \
--architecture $(USERSPACE_ARCH) \
--extrapackages "build-essential debhelper gnupg lintian" \
diff --git a/pbuilder-hooks/D05deps b/pbuilder-hooks/D05deps
index 9f35697..0ac9207 100755
--- a/pbuilder-hooks/D05deps
+++ b/pbuilder-hooks/D05deps
@@ -1,10 +1,11 @@
#!/bin/bash -xe
sed -i '/^deb http:/ s/$/ contrib non-free/' /etc/apt/sources.list
echo "deb [trusted=yes] file://$DEPSBASE ./" >> /etc/apt/sources.list
+echo "deb [arch=arm64] http://packages.cloud.google.com/apt mendel-bsp-$BOARD_NAME-day main" >> /etc/apt/sources.list
echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" >> /etc/apt/sources.list
echo 'Debug::pkgProblemResolver true;' > /etc/apt/apt.conf
cp -r ${ROOTDIR}/build/lintian /usr/share/
cat ${ROOTDIR}/build/bazel-release.pub.gpg | apt-key add -
cat ${ROOTDIR}/packages/mendel-keyring/cloud-key.gpg | apt-key add -
cat ${ROOTDIR}/packages/mendel-keyring/linux_signing_key.pub |apt-key add -
-apt-get update
+apt-get update || true
