manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/Install_package/Install_packages/ 

it installs one or more, so should be plural for clarity

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-05-05 16:42:44 +01:00
parent 9c8d26c97f
commit 919a464b64
19 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/packages.sh
View File

@ -37,7 +37,7 @@ Check_package ()
}
# Note, reads from _LB_PACKAGES
Install_package ()
Install_packages ()
{
if [ -z "${_LB_PACKAGES}" ] || [ "${LB_BUILD_WITH_CHROOT}" != "true" ]; then
return

6
scripts/build/binary_grub-efi
View File

@ -90,7 +90,7 @@ case "${LB_UEFI_SECURE_BOOT}" in
auto)
# Use Check_installed, as Check_package will error out immediately
set +e
Install_package
Install_packages
set -e
Check_installed chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/gcd${_SB_EFI_NAME}.efi.signed \
grub-efi-${_SB_EFI_DEB}-signed
@ -110,7 +110,7 @@ case "${LB_UEFI_SECURE_BOOT}" in
grub-efi-${_SB_EFI_DEB}-signed
Check_package chroot /usr/lib/shim/shim${_SB_EFI_NAME}.efi.signed \
shim-signed
Install_package
Install_packages
Echo_message "UEFI Secure Boot support enabled."
;;
disable)
@ -123,7 +123,7 @@ _LB_PACKAGES="${_PRE_SB_PACKAGES}"
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Cleanup files that we generate
rm -rf binary/boot/efi.img binary/boot/grub/i386-efi/ binary/boot/grub/x86_64-efi binary/boot/grub/arm64-efi binary/boot/grub/arm-efi

2
scripts/build/binary_grub-legacy
View File

@ -51,7 +51,7 @@ Check_package chroot /usr/sbin/grub grub-legacy
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Local functions
Grub_live_entry ()

2
scripts/build/binary_grub-pc
View File

@ -53,7 +53,7 @@ Check_package chroot /usr/bin/grub-mkimage grub-pc
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Copying templates
mkdir -p binary/boot/grub/i386-pc

2
scripts/build/binary_hdd
View File

@ -78,7 +78,7 @@ esac
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Remove old binary
if [ -f ${LB_IMAGE_NAME}.img ]

2
scripts/build/binary_iso
View File

@ -54,7 +54,7 @@ Check_package chroot /usr/lib/ISOLINUX/isohdpfx.bin isolinux
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Remove old iso image
if [ -f ${IMAGE} ]

2
scripts/build/binary_loadlin
View File

@ -46,7 +46,7 @@ case "${LB_ARCHITECTURE}" in
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
case "${LB_BUILD_WITH_CHROOT}" in
true)

2
scripts/build/binary_memtest
View File

@ -70,7 +70,7 @@ esac
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Setting destination directory
case "${LB_INITRAMFS}" in

2
scripts/build/binary_package-lists
View File

@ -46,7 +46,7 @@ then
Restore_package_cache chroot
# Installing depends
Install_package
Install_packages
if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
then

6
scripts/build/binary_rootfs
View File

@ -78,7 +78,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Remove old image
if [ -f binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} ]
@ -176,7 +176,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Remove old jffs2 image
if [ -f binary/${INITFS}/filesystem.jffs2 ]
@ -251,7 +251,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
Echo_message "Preparing squashfs image..."
Echo_message "This may take a while."

2
scripts/build/binary_syslinux
View File

@ -101,7 +101,7 @@ Check_package chroot /usr/bin/rsvg-convert librsvg2-bin
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
# Ensure fresh
rm -rf ${_TARGET}

2
scripts/build/binary_win32-loader
View File

@ -48,7 +48,7 @@ case "${LB_ARCHITECTURE}" in
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then

2
scripts/build/binary_zsync
View File

@ -49,7 +49,7 @@ Check_package chroot /usr/bin/zsyncmake zsync
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
case "${LB_IMAGE_TYPE}" in
iso)

2
scripts/build/chroot_archives
View File

@ -166,7 +166,7 @@ case "${_ACTION}" in
Check_package chroot /usr/bin/apt-ftparchive apt-utils
# Installing depends
Install_package
Install_packages
# Generate Packages and Packages.gz
echo "cd /root/packages && apt-ftparchive packages . > Packages" | Chroot chroot sh

2
scripts/build/chroot_package-lists
View File

@ -54,7 +54,7 @@ Check_package chroot /usr/bin/grep-aptavail dctrl-tools
Restore_package_cache chroot
# Installing depends
Install_package
Install_packages
if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
then

2
scripts/build/chroot_preseed
View File

@ -40,7 +40,7 @@ then
Check_package chroot /usr/bin/debconf-set-selections debconf
# Install dependency
Install_package
Install_packages
for PRESEED in config/preseed/*.cfg config/preseed/*.cfg.chroot chroot/root/packages.chroot.cfg
do

2
scripts/build/installer_debian-installer
View File

@ -47,7 +47,7 @@ Check_package chroot /usr/bin/apt-ftparchive apt-utils
Restore_package_cache binary
# Installing depends
Install_package
Install_packages
if [ "${_DEBUG}" = "true" ]
then

2
scripts/build/source_hdd
View File

@ -48,7 +48,7 @@ Check_package host /sbin/fdisk fdisk
Check_package host /sbin/losetup mount
# Installing depends
Install_package
Install_packages
# Remove old source
if [ -f ${LB_IMAGE_NAME}-source.img ]

2
scripts/build/source_iso
View File

@ -50,7 +50,7 @@ Acquire_lockfile
Check_package chroot /usr/bin/xorriso xorriso
# Installing depends
Install_package
Install_packages
# Remove old iso image
if [ -f ${LB_IMAGE_NAME}-source.iso ]