Codebase list live-build / dba168e
Merge branch 'debian' Sophie Brun 5 years ago
7 changed file(s) with 50 addition(s) and 32 deletion(s). Raw diff Collapse all Expand all
+21
-0
debian/changelog less more
0 live-build (1:20180925) unstable; urgency=medium
1
2 [ Raphaël Hertzog ]
3 * Handle includes.chroot files installed over symlinked directories
4
5 [ Marcel Partap ]
6 * copy keys to /etc/apt/trusted.gpg.d with appropriate extension for
7 them to not be ignored.
8
9 [ Steven Shiau ]
10 * Use gcd{x64.aa64}.efi.signed for amd64/arm64 arch.
11
12 [ Luca Boccassi ]
13 * UEFI: remove the EFI/debian/grub.cfg, not necessary anymore
14 * Build-Depend on debhelper >= 10~ to facilitate backports.
15 * Add Rules-Requires-Root: no.
16 * Bump Standards-Version to 4.2.1.
17 * lintian: override error on dependency on e2fsprogs
18
19 -- Luca Boccassi <[email protected]> Tue, 25 Sep 2018 14:28:19 +0100
20
021 live-build (1:20180618kali1) kali-dev; urgency=medium
122
223 * Synchronize with Debian. Remaining changes:
+3
-2
debian/control less more
44 Uploaders: Raphaël Hertzog <[email protected]>,
55 Luca Boccassi <[email protected]>,
66 Build-Depends:
7 debhelper (>= 10),
7 debhelper (>= 10~),
88 po4a,
99 gettext,
10 Standards-Version: 4.1.4
10 Standards-Version: 4.2.1
11 Rules-Requires-Root: no
1112 Homepage: https://debian-live.alioth.debian.org/live-build/
1213 Vcs-Browser: https://salsa.debian.org/live-team/live-build
1314 Vcs-Git: https://salsa.debian.org/live-team/live-build.git
+1
-0
debian/live-build.lintian-overrides less more
00 live-build: symlink-should-be-relative
1 live-build: depends-on-essential-package-without-using-version suggests: e2fsprogs
+8
-27
scripts/build/binary_grub-efi less more
8181 set +e
8282 Install_package
8383 set -e
84 Check_installed chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/grub${_SB_EFI_NAME}.efi.signed \
84 Check_installed chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/gcd${_SB_EFI_NAME}.efi.signed \
8585 grub-efi-${_SB_EFI_DEB}-signed
8686 _GRUB_INSTALL_STATUS="${INSTALL_STATUS}"
8787 Check_installed chroot /usr/lib/shim/shim${_SB_EFI_NAME}.efi.signed \
9595 fi
9696 ;;
9797 enable)
98 Check_package chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/grub${_SB_EFI_NAME}.efi.signed \
98 Check_package chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/gcd${_SB_EFI_NAME}.efi.signed \
9999 grub-efi-${_SB_EFI_DEB}-signed
100100 Check_package chroot /usr/lib/shim/shim${_SB_EFI_NAME}.efi.signed \
101101 shim-signed
173173 # and grub-efi-amd64-signed, currently in Ubuntu:
174174 # https://packages.ubuntu.com/xenial/amd64/grub-efi-amd64-signed/filelist
175175 # https://packages.ubuntu.com/bionic/arm64/grub-efi-arm64-signed/filelist
176 if [ -r ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/grub\$efi_name.efi.signed -a \
176 # E.g., gcdx64.efi.signed is the boot loader for removable device, like CD or
177 # USB flash drive, while grubx64.efi.signed is for hard drive.
178 # Therefore here gcdx64.efi.signed is used for amd64 and gcdaa64.efi.signed is
179 # for arm64.
180 if [ -r ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/gcd\$efi_name.efi.signed -a \
177181 -r ${_CHROOT_DIR}/usr/lib/shim/shim\$efi_name.efi.signed -a \
178182 "${LB_UEFI_SECURE_BOOT}" != "disable" ]; then
179 mkdir -p "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR"
180 cp ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/grub\$efi_name.efi.signed \
183 cp ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/gcd\$efi_name.efi.signed \
181184 ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/grub\$efi_name.efi
182185 cp ${_CHROOT_DIR}/usr/lib/shim/shim\$efi_name.efi.signed \
183186 ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/boot\$efi_name.efi
184187 fi
185188 }
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
194189
195190 PRE_EFI_IMAGE_PATH="${PATH}"
196191 if [ ! -e "${LIVE_BUILD}" ] ; then
247242 # directories: EFI EFI/boot boot boot/grub
248243 size=\$((\$size + 4096 * 4))
249244
250 # EFI/\$EFI_VENDOR and additional grub.cfg
251 if [ -d "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR" ]; then
252 size=\$((\$size + 4096))
253 size=\$((\$size + \$(stat -c %s "${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg")))
254 cp ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg \
255 "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR"
256 fi
257
258245 blocks=\$(((\$size / 1024 + 55) / 32 * 32 ))
259246
260247 rm -f ${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img
263250 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::EFI/boot
264251 mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/*.efi \
265252 "::EFI/boot"
266
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"
269 mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" \
270 ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg "::EFI/\$EFI_VENDOR"
271 fi
272253
273254 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::boot
274255 mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::boot/grub
+6
-1
scripts/build/bootstrap_archives less more
221221 do
222222 if [ -e "${FILE}" ]
223223 then
224 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
224 if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}"
225 then
226 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
227 else
228 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
229 fi
225230 fi
226231 done
227232 fi
+6
-1
scripts/build/chroot_archives less more
352352 do
353353 if [ -e "${FILE}" ]
354354 then
355 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
355 if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}"
356 then
357 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
358 else
359 cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
360 fi
356361 fi
357362 done
358363 fi
+5
-1
scripts/build/chroot_includes less more
4141 then
4242 # Copying includes
4343 cd config/includes.chroot
44 find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot
44 Echo_message "Creating a tarball with files from includes.chroot..."
45 tar cf "${OLDPWD}"/chroot/includes.chroot.tar .
4546 cd "${OLDPWD}"
47 Echo_message "Extracting the tarball in the chroot..."
48 Chroot chroot "tar -xvf includes.chroot.tar --no-same-owner --keep-directory-symlink --overwrite"
49 rm chroot/includes.chroot.tar
4650
4751 # Creating stage file
4852 Create_stagefile .build/includes.chroot