diff --git a/build.sh b/build.sh index 2aebaf3..244960f 100755 --- a/build.sh +++ b/build.sh @@ -208,7 +208,6 @@ export IMG_NAME export HOSTNAME export USERNAME export PASSWORD -export APT_PROXY export STAGE export STAGE_DIR diff --git a/scripts/common.sh b/scripts/common.sh index bbe128e..202408e 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -11,8 +11,6 @@ bootstrap() { local ARCH ARCH=$(dpkg --print-architecture) - export http_proxy=${APT_PROXY} - if [ "$ARCH" != "armhf" ]; then local BOOTSTRAP_CMD=qemu-debootstrap else diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh index 7966ef1..b4450d4 100755 --- a/stage0/00-configure-apt/00-run.sh +++ b/stage0/00-configure-apt/00-run.sh @@ -3,13 +3,6 @@ install -m 644 files/sources.list ${ROOTFS_DIR}/etc/apt/ install -m 644 files/raspi.list ${ROOTFS_DIR}/etc/apt/sources.list.d/ -if [ -n "$APT_PROXY" ]; then - install -m 644 files/51cache ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache - sed ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -i -e "s|APT_PROXY|${APT_PROXY}|" -else - rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -fi - on_chroot apt-key add - < files/raspberrypi.gpg.key on_chroot << EOF apt-get update diff --git a/stage0/00-configure-apt/files/51cache b/stage0/00-configure-apt/files/51cache deleted file mode 100644 index a8920a9..0000000 --- a/stage0/00-configure-apt/files/51cache +++ /dev/null @@ -1 +0,0 @@ -Acquire::http { Proxy "APT_PROXY"; };