summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-11-02 21:46:28 +0000
committerTails developers <amnesia@boum.org>2014-11-03 09:56:43 +0000
commitfacf2a6e5eb8596640e32640cdaf15881d0be9b9 (patch)
tree543839b92a28c725212fd5e297896c0a95e7b192 /config/binary_local-hooks
parent05636d16477542829beb558688789cb62f84b72f (diff)
Adjust hook that includes syslinux in the ISO filesystem to APT being moved from HTTP to SOCKS.
Don't run apt-get update in the chroot again after reconfiguring APT sources for runtime. This is broken by the move to torsocks. Back when we used a HTTP proxy, the HTTP_PROXY environment variable passed by the build environment was overriding the APT proxy configured for runtime. This is not the case anymore, and now that APT run tries to use both the tor+http shim and the HTTP proxy used in the build environment, which is rejected by torsocks. Besides, the build process works just fine without this "apt-get update" run, so let's just drop it.
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
index 27a1cdd..8fc75e1 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -43,13 +43,12 @@ cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin"
cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \
| sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \
> "$CHROOT_TEMP_APT_SOURCES"
-mv chroot/etc/apt/apt.conf.d/{,.}0000runtime-proxy
+Chroot chroot /usr/local/lib/apt-toggle-tor-http off
Chroot chroot apt-get --yes update
Chroot chroot apt-get --yes install dpkg-dev
Chroot chroot apt-get source syslinux="$(syslinux_deb_version_in_chroot)"
cp chroot/syslinux-*/bios/win32/syslinux.exe "$WIN32_BINARY_UTILS_DIR/"
rm -r chroot/syslinux*
rm "$CHROOT_TEMP_APT_SOURCES"
-mv chroot/etc/apt/apt.conf.d/{.,}0000runtime-proxy
-Chroot chroot apt-get --yes update
+Chroot chroot /usr/local/lib/apt-toggle-tor-http on
Chroot chroot apt-get --yes purge dpkg-dev make # dpkg-dev depends on make