summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-01-21 15:16:45 +0000
committerTails developers <amnesia@boum.org>2015-01-21 15:16:45 +0000
commit64adfc7df40966f550e078dc06ecb66812ddf51a (patch)
tree80b9fdda8927c95b963f06e3317666f986cd981d /config/binary_local-hooks
parent91fdcdbdbea25becb639267b5d218d9370f39113 (diff)
Don't attempt to retrieve source packages from local-packages (Will-Fix: #8756).
live-build does not include source packages in the index of locally available packages. This makes since, since we don't include deb-src lines for other repositories. And then, as reported on https://labs.riseup.net/code/issues/8724#note-12, whenever ones uses the config/chroot_local-packages feature, the build fails. Therefore, when we generate temporary deb-src entries, skip the repository that indexes locally available packages. This should only be problematic if one wants to provide the syslinux source package there, which is unlikely, and in any case way less important than repairing config/chroot_local-packages for the general case (binary packages).
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem2
1 files changed, 2 insertions, 0 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..21ac01f 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -41,6 +41,8 @@ cp "$CHROOT_SYSLINUX_BIN" "$LINUX_BINARY_UTILS_DIR/"
cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin"
cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \
+ | grep --extended-regexp --line-regexp --invert-match \
+ 'deb\s+file:/root/local-packages\s+\./' \
| sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \
> "$CHROOT_TEMP_APT_SOURCES"
Chroot chroot /usr/local/lib/apt-toggle-tor-http off