Add support for network proxy settings.
Modify build/99network-settings file if your configuration requires
proxy usage.
Also picks up host machine http_proxy env variable where needed.
Change-Id: I96ae4c7099c206b5507995f6e1061a5e3788eed7
diff --git a/99network-settings b/99network-settings
new file mode 100644
index 0000000..12ae117
--- /dev/null
+++ b/99network-settings
@@ -0,0 +1,6 @@
+Acquire::Retries 10;
+Acquire::http::Timeout 30;
+
+// Uncomment next line if you need to use proxy
+//Acquire::http::Proxy "http://<proxy_address>:<proxy_port>";
+
diff --git a/docker.mk b/docker.mk
index 5861992..f9ab4b3 100644
--- a/docker.mk
+++ b/docker.mk
@@ -74,6 +74,7 @@
-e "FETCH_PACKAGES=$(FETCH_PACKAGES)" \
-e "PACKAGES_REVISION=$(PACKAGES_REVISION)" \
-e "HEADLESS_BUILD=$(HEADLESS_BUILD)" \
+ -e "http_proxy=$(http_proxy)" \
aiy-board-builder \
/bin/bash -c \
'groupadd --gid $(shell id -g) $(shell id -g -n); \
@@ -81,6 +82,7 @@
passwd -d $(shell id -u -n); \
echo "$(shell id -u -n) ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
adduser $(shell id -u -n) docker; \
+ sudo cp /rootdir/build/99network-settings /etc/apt/apt.conf.d/;\
/etc/init.d/docker start; \
sudo -E -u $(shell id -u -n) /bin/bash -c "source build/setup.sh; m \
-j$$(nproc) $*";'
diff --git a/packages.mk b/packages.mk
index 5500b09..ee61fac 100644
--- a/packages.mk
+++ b/packages.mk
@@ -78,6 +78,8 @@
$(PRODUCT_OUT)/obj/$1_$$(call get-deb-version-full,$1).debian.tar.gz \
debian
+ sudo cp $(ROOTDIR)/build/99network-settings ~/
+ echo "cp ~/99network-settings /etc/apt/apt.conf.d/" | sudo tee ~/.pbuilderrc
cd $(PRODUCT_OUT)/obj/$1; pdebuild \
--buildresult $(PRODUCT_OUT)/packages -- \
--debbuildopts "--build=$(if $5,$5,full)" \
diff --git a/rootfs.mk b/rootfs.mk
index 91796c3..2bbe398 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -136,6 +136,7 @@
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/
+ 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 update'
