Codebase list live-build / 72ea6ff
Merge branch 'debian' Sophie Brun 5 years ago
6 changed file(s) with 36 addition(s) and 20 deletion(s). Raw diff Collapse all Expand all
+13
-0
debian/changelog less more
0 live-build (1:20180618) unstable; urgency=medium
1
2 * ONIE: make lb clean remove the ONIE binary.
3 * Avoid apt-key add and just drop the custom user-supplied apt key in
4 /etc/apt/trusted.gpg.d. Note that this requires the key to be in
5 armored ASCII format - which is usually the default anyway.
6 * UEFI: parse vendor from Grub package metadata if available, and use
7 it in the EFI partition directory layout instead of always using
8 "debian" (which is still the default fallback).
9 * Bump Standards-Version to 4.1.4, no changes.
10
11 -- Luca Boccassi <[email protected]> Mon, 18 Jun 2018 12:02:55 +0100
12
013 live-build (1:20180411kali1) kali-dev; urgency=medium
114
215 * Synchronize with Debian. Remaining changes:
+1
-1
debian/control less more
77 debhelper (>= 10),
88 po4a,
99 gettext,
10 Standards-Version: 4.1.3
10 Standards-Version: 4.1.4
1111 Homepage: https://debian-live.alioth.debian.org/live-build/
1212 Vcs-Browser: https://salsa.debian.org/live-team/live-build
1313 Vcs-Git: https://salsa.debian.org/live-team/live-build.git
+18
-10
scripts/build/binary_grub-efi less more
165165 # certain firmwares (eg: TianoCore) happy
166166 # - use shim as the boot<arch>.efi that gets loaded first by the firmware
167167 # - drop a grub.cfg (same reason as below) in the cfg directory as configured
168 # by the signed grub efi binary creation. At the moment that is EFI/debian
169 # as set by grub2/debian/build-efi-images and cannot be changed without
170 # rebuilding grub2
168 # by the signed grub efi binary creation. This is set dynamically when grub2 is
169 # built with the ouput of dpkg-vendor, and can be overridden by the builder, so
170 # we do the same here in live-build.
171171 # - the source paths are taken from shim-signed:
172172 # https://packages.debian.org/sid/amd64/shim-signed/filelist
173173 # and grub-efi-amd64-signed, currently in Ubuntu:
176176 if [ -r ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/grub\$efi_name.efi.signed -a \
177177 -r ${_CHROOT_DIR}/usr/lib/shim/shim\$efi_name.efi.signed -a \
178178 "${LB_UEFI_SECURE_BOOT}" != "disable" ]; then
179 mkdir -p ${_CHROOT_DIR}/grub-efi-temp/EFI/debian
179 mkdir -p "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR"
180180 cp ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/grub\$efi_name.efi.signed \
181181 ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/grub\$efi_name.efi
182182 cp ${_CHROOT_DIR}/usr/lib/shim/shim\$efi_name.efi.signed \
183183 ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/boot\$efi_name.efi
184184 fi
185185 }
186
187 # The EFI vendor, used by Grub to set the directory in the monolithic image, depends
188 # on the distro vendor set at Grub's build time. It will be added to the package metadata.
189 EFI_VENDOR="\$(dpkg-query -f='\${Efi-Vendor}' -W grub-efi-${_SB_EFI_DEB}-bin)"
190 # If it's missing, fallback to the previous usage of just "debian".
191 if [ -z "$EFI_VENDOR" ]; then
192 EFI_VENDOR="debian"
193 fi
186194
187195 PRE_EFI_IMAGE_PATH="${PATH}"
188196 if [ ! -e "${LIVE_BUILD}" ] ; then
239247 # directories: EFI EFI/boot boot boot/grub
240248 size=\$((\$size + 4096 * 4))
241249
242 # EFI/debian and additional grub.cfg
243 if [ -d ${_CHROOT_DIR}/grub-efi-temp/EFI/debian ]; then
250 # EFI/\$EFI_VENDOR and additional grub.cfg
251 if [ -d "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR" ]; then
244252 size=\$((\$size + 4096))
245253 size=\$((\$size + \$(stat -c %s "${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg")))
246254 cp ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg \
247 ${_CHROOT_DIR}/grub-efi-temp/EFI/debian
255 "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR"
248256 fi
249257
250258 blocks=\$(((\$size / 1024 + 55) / 32 * 32 ))
256264 mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/*.efi \
257265 "::EFI/boot"
258266
259 if [ -d ${_CHROOT_DIR}/grub-efi-temp/EFI/debian ]; then
260 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::EFI/debian
267 if [ -d "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR" ]; then
268 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" "::EFI/\$EFI_VENDOR"
261269 mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" \
262 ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg "::EFI/debian"
270 ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg "::EFI/\$EFI_VENDOR"
263271 fi
264272
265273 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::boot
+1
-3
scripts/build/bootstrap_archives less more
221221 do
222222 if [ -e "${FILE}" ]
223223 then
224 cp ${FILE} chroot/root
225 Chroot chroot "apt-key add /root/$(basename ${FILE})"
226 rm -f chroot/root/$(basename ${FILE})
224 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
227225 fi
228226 done
229227 fi
+2
-6
scripts/build/chroot_archives less more
352352 do
353353 if [ -e "${FILE}" ]
354354 then
355 cp ${FILE} chroot/root
356 Chroot chroot "apt-key add /root/$(basename ${FILE})"
357 rm -f chroot/root/$(basename ${FILE})
355 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
358356 fi
359357 done
360358 fi
636634 do
637635 if [ -e "${FILE}" ]
638636 then
639 cp ${FILE} chroot/root
640 Chroot chroot "apt-key add /root/$(basename ${FILE})"
641 rm -f chroot/root/$(basename ${FILE})
637 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
642638 fi
643639 done
644640
+1
-0
scripts/build/clean less more
103103 rm -f ${LIVE_IMAGE_NAME}*.zsync*
104104 rm -f ${LIVE_IMAGE_NAME}.sh
105105 rm -f ${LIVE_IMAGE_NAME}*.contents ${LIVE_IMAGE_NAME}*.packages ${LIVE_IMAGE_NAME}*.files
106 rm -f ${LIVE_IMAGE_NAME}*.iso-ONIE.bin
106107 rm -f MD5SUMS SHA1SUMS SHA256SUMS SHA512SUMS
107108 rm -f md5sum.txt sha1sum.txt sha256sum.txt sha512sum.txt
108109