summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-01-21 11:34:52 +0000
committerTails developers <amnesia@boum.org>2015-01-21 11:34:52 +0000
commit03e574e24b237a0d1757fb313409b8841744a108 (patch)
treed140d6a594c447080d338b4df1e8f0f64c56c834 /config/binary_local-hooks
parent85b4f627de6081d7687bb5044046baea596bec6f (diff)
parent138087624e4bf53d71a7d4e5f0108b1e4395495c (diff)
Merge branch 'bugfix/8715-build-system-independent-APT-sources' into feature/jessie
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem2
1 files changed, 0 insertions, 2 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 8fc75e1..e79fb91 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -43,12 +43,10 @@ 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"
-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"
-Chroot chroot /usr/local/lib/apt-toggle-tor-http on
Chroot chroot apt-get --yes purge dpkg-dev make # dpkg-dev depends on make