Codebase list live-build / 84fcc58
Import Debian version 20210216 live-build (1:20210216) unstable; urgency=medium . [ Raphaël Hertzog ] * Add symlinks to support kali releases . [ Roland Clobus ] * Reproducible fix for glibc . [ Ryan Finnie ] * binary_syslinux: Do not modify grub theme.txt if grub/splash.png exists * Restore_package_cache: Handle existing but empty packages directory . [ Roland Clobus ] * The local LIVE_BUILD wins over the system live-build for the list of udeb inclusions. Only copy when the distribution is known * The local LIVE_BUILD wins over the system live-build for the list of udeb exclusions * lilo is not available any more in Bullseye (and newer), see #973850 * Adding symlink for udeb data for bullseye . [ Luca Boccassi ] * Fix build on architecture without syslinux (Closes: #982746) * autopkgtest: restrict to amd64 and i386 for now . [ Roland Clobus ] * mkfs.msdos needs at most 32 bits for the -i argument. Use the hexadecimal version of SOURCE_DATE_EPOCH, limited to the lower 32 bits Luca Boccassi authored 3 years ago Raphaël Hertzog committed 3 years ago
14 changed file(s) with 61 addition(s) and 13 deletion(s). Raw diff Collapse all Expand all
+1
-0
data/debian-cd/bullseye less more
0 squeeze/⏎
+1
-0
data/debian-cd/kali-dev less more
0 sid⏎
+1
-0
data/debian-cd/kali-last-snapshot less more
0 sid⏎
+1
-0
data/debian-cd/kali-rolling less more
0 sid⏎
+31
-0
debian/changelog less more
0 live-build (1:20210216) unstable; urgency=medium
1
2 [ Raphaël Hertzog ]
3 * Add symlinks to support kali releases
4
5 [ Roland Clobus ]
6 * Reproducible fix for glibc
7
8 [ Ryan Finnie ]
9 * binary_syslinux: Do not modify grub theme.txt if grub/splash.png
10 exists
11 * Restore_package_cache: Handle existing but empty packages directory
12
13 [ Roland Clobus ]
14 * The local LIVE_BUILD wins over the system live-build for the list of
15 udeb inclusions. Only copy when the distribution is known
16 * The local LIVE_BUILD wins over the system live-build for the list of
17 udeb exclusions
18 * lilo is not available any more in Bullseye (and newer), see #973850
19 * Adding symlink for udeb data for bullseye
20
21 [ Luca Boccassi ]
22 * Fix build on architecture without syslinux (Closes: #982746)
23 * autopkgtest: restrict to amd64 and i386 for now
24
25 [ Roland Clobus ]
26 * mkfs.msdos needs at most 32 bits for the -i argument. Use the
27 hexadecimal version of SOURCE_DATE_EPOCH, limited to the lower 32 bits
28
29 -- Luca Boccassi <[email protected]> Tue, 16 Feb 2021 21:25:05 +0000
30
031 live-build (1:20210122) unstable; urgency=medium
132
233 [ Raphaël Hertzog ]
+2
-0
debian/tests/control less more
00 Tests: build-default-image
11 Depends: live-build,
22 Restrictions: needs-root, allow-stderr, needs-internet
3 Architecture: amd64 i386
34
45 Tests: build-kali-image
56 Depends: live-build, git, ca-certificates, curl, apt-utils, bzip2, cpio, file, wget, xz-utils
67 Restrictions: needs-root, allow-stderr, flaky, needs-internet
8 Architecture: amd64 i386
+2
-2
functions/cache.sh less more
2020 if [ "$(stat --printf %d ${DIRECTORY}/)" = "$(stat --printf %d chroot/var/cache/apt/archives/)" ]
2121 then
2222 # with hardlinks
23 find "${DIRECTORY}" -name "*.deb" | xargs cp -fl -t chroot/var/cache/apt/archives
23 find "${DIRECTORY}" -name "*.deb" -print0 | xargs -0 --no-run-if-empty cp -fl -t chroot/var/cache/apt/archives
2424 else
2525 # without hardlinks
26 find "${DIRECTORY}" -name "*.deb" | xargs cp -t chroot/var/cache/apt/archives
26 find "${DIRECTORY}" -name "*.deb" -print0 | xargs -0 --no-run-if-empty cp -t chroot/var/cache/apt/archives
2727 fi
2828 fi
2929 fi
+2
-2
scripts/build/binary_disk less more
130130 esac
131131
132132 #FIXME review the netboot case
133 for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd
133 for LOCATION in /usr/share/live/build/data/debian-cd "${LIVE_BUILD}/data/debian-cd"
134134 do
135 if [ -e "${LOCATION}" ]
135 if [ -e "${LOCATION}/${LB_PARENT_DISTRIBUTION_BINARY}" ]
136136 then
137137 case "${LB_DEBIAN_INSTALLER}" in
138138 cdrom)
+2
-1
scripts/build/binary_grub-efi less more
257257 blocks=\$(((\$size / 1024 + 55) / 32 * 32 ))
258258
259259 rm -f ${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img
260 mkfs.msdos -C "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" \$blocks -i ${SOURCE_DATE_EPOCH} >/dev/null
260 # The VOLID must be (truncated to) a 32bit hexadecimal number
261 mkfs.msdos -C "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" \$blocks -i $(printf "%08x" $((${SOURCE_DATE_EPOCH}%4294967296))) >/dev/null
261262 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::EFI
262263 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::EFI/boot
263264 mcopy -m -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/*.efi \
+1
-1
scripts/build/binary_iso less more
6565 XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes -iso-level 3"
6666
6767 # Handle xorriso live-build specific options
68 if [ "${LB_IMAGE_TYPE}" = "iso-hybrid" ]
68 if [ "${LB_IMAGE_TYPE}" = "iso-hybrid" ] && [ "${LB_BOOTLOADER_BIOS}" = "syslinux" ]
6969 then
7070 XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -partition_offset 16"
7171 fi
+2
-2
scripts/build/binary_syslinux less more
312312 fi
313313 rm -f "${_TARGET}/splash.svg"
314314
315 # Tweak the grub theme to reuse the syslinux background image
316 if [ -e binary/boot/grub/live-theme/theme.txt ]; then
315 # Tweak the grub theme to reuse the syslinux background image if grub doesn't have its own
316 if [ -e binary/boot/grub/live-theme/theme.txt ] && [ ! -e binary/boot/grub/splash.png ]; then
317317 sed -i -e 's|^desktop-image:.*|desktop-image: "/isolinux/splash.png"|' \
318318 -e 's|^title-text:.*|title-text: ""|' \
319319 binary/boot/grub/live-theme/theme.txt
+2
-1
scripts/build/efi-image less more
7474
7575 # Stuff it into a FAT filesystem, making it as small as possible. 24KiB
7676 # headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32.
77 # The VOLID must be (truncated to) a 32bit hexadecimal number
7778 mkfs.msdos -C "$outdir/efi.img" \
7879 $(( ($(stat -c %s "$workdir/boot$efi_name.efi") / 1024 + 55) \
79 / 32 * 32 )) -i ${SOURCE_DATE_EPOCH}
80 / 32 * 32 )) -i $(printf "%08x" $((${SOURCE_DATE_EPOCH}%4294967296)))
8081 mmd -i "$outdir/efi.img" ::efi
8182 mmd -i "$outdir/efi.img" ::efi/boot
8283 # Set the timestamp of the .efi file
+4
-4
scripts/build/installer_debian-installer less more
290290
291291 case "${LB_ARCHITECTURE}" in
292292 amd64)
293 DI_REQ_PACKAGES="lilo grub-pc"
293 DI_REQ_PACKAGES="grub-pc"
294294 DI_PACKAGES="linux-image-amd64"
295295 ;;
296296
297297 i386)
298 DI_REQ_PACKAGES="lilo grub-pc"
298 DI_REQ_PACKAGES="grub-pc"
299299 DI_PACKAGES="linux-image-686-pae"
300300 ;;
301301
614614 Echo_debug "Generating exclude list"
615615
616616 # Excluding udebs
617 for LOCATION in "${LIVE_BUILD}/data/debian-cd" /usr/share/live/build/data/debian-cd
617 for LOCATION in /usr/share/live/build/data/debian-cd "${LIVE_BUILD}/data/debian-cd"
618618 do
619 if [ -e "${LOCATION}" ]
619 if [ -e "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" ]
620620 then
621621 grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true
622622 grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs" >> exclude || true
+9
-0
share/hooks/normal/0500-reproducible-glibc.hook.chroot less more
0 #!/bin/sh
1
2 set -e
3
4 # Remove the non-reproducible file that is created by ldconfig
5 #
6 # The file does not need to exist, see elf/cache.c:load_aux_cache
7 # The file and folder will be recreated when needed, see elf/cache.c:save_aux_cache
8 rm -fr /var/cache/ldconfig