summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/binary_disk2
-rwxr-xr-xscripts/build/binary_grub-efi2
-rwxr-xr-xscripts/build/binary_grub-legacy4
-rwxr-xr-xscripts/build/binary_grub-pc4
-rwxr-xr-xscripts/build/binary_hdd2
-rwxr-xr-xscripts/build/binary_includes2
-rwxr-xr-xscripts/build/binary_iso4
-rwxr-xr-xscripts/build/binary_netboot2
-rwxr-xr-xscripts/build/binary_onie2
-rwxr-xr-xscripts/build/binary_syslinux2
-rwxr-xr-xscripts/build/binary_tar2
-rwxr-xr-xscripts/build/binary_zsync4
-rwxr-xr-xscripts/build/chroot_hacks2
-rwxr-xr-xscripts/build/config6
-rwxr-xr-xscripts/build/installer_debian-installer6
15 files changed, 23 insertions, 23 deletions
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index ca89ba599..59bf5a42d 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if ! In_list "${LIVE_IMAGE_TYPE}" iso iso-hybrid hdd; then
+if ! In_list "${LB_IMAGE_TYPE}" iso iso-hybrid hdd; then
exit 0
fi
diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi
index d94f8bfd3..6b4101e8f 100755
--- a/scripts/build/binary_grub-efi
+++ b/scripts/build/binary_grub-efi
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if In_list "${LIVE_IMAGE_TYPE}" hdd netboot; then
+if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
exit 0
fi
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index 9f0078ba6..19b80e7bb 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if In_list "${LIVE_IMAGE_TYPE}" hdd netboot; then
+if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
exit 0
fi
@@ -200,7 +200,7 @@ fi
mkdir -p binary/boot/grub
cp -r "${_SOURCE}"/* binary/boot/grub
-case ${LIVE_IMAGE_TYPE} in
+case ${LB_IMAGE_TYPE} in
iso|iso-hybrid)
FILES="chroot/usr/lib/grub/*/stage2_eltorito"
;;
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index 86e0ac431..cd385ead2 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if In_list "${LIVE_IMAGE_TYPE}" hdd netboot; then
+if In_list "${LB_IMAGE_TYPE}" hdd netboot; then
exit 0
fi
@@ -54,7 +54,7 @@ Install_package
# Copying templates
mkdir -p binary/boot/grub/i386-pc
-case ${LIVE_IMAGE_TYPE} in
+case ${LB_IMAGE_TYPE} in
iso|iso-hybrid)
FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
;;
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index a7979965d..8012c362c 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if [ "${LIVE_IMAGE_TYPE}" != "hdd" ]; then
+if [ "${LB_IMAGE_TYPE}" != "hdd" ]; then
exit 0
fi
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
index b9482a552..e5a3f4f92 100755
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@@ -40,7 +40,7 @@ then
cd "${OLDPWD}"
# Removing symlinks
- if [ "${LIVE_IMAGE_TYPE}" = "hdd" ]; then
+ if [ "${LB_IMAGE_TYPE}" = "hdd" ]; then
find binary -type l | xargs rm -f
fi
fi
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index c260bdbe8..4fdbfdc57 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-case "${LIVE_IMAGE_TYPE}" in
+case "${LB_IMAGE_TYPE}" in
iso)
IMAGE="${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.iso"
;;
@@ -66,7 +66,7 @@ fi
XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes -iso-level 3"
# Handle xorriso live-build specific options
-if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
+if [ "${LB_IMAGE_TYPE}" = "iso-hybrid" ]
then
XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -partition_offset 16"
fi
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot
index a324e7fc1..c88bc6296 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if [ "${LIVE_IMAGE_TYPE}" != "netboot" ]; then
+if [ "${LB_IMAGE_TYPE}" != "netboot" ]; then
exit 0
fi
diff --git a/scripts/build/binary_onie b/scripts/build/binary_onie
index 356e2b6e2..c8fcbef8d 100755
--- a/scripts/build/binary_onie
+++ b/scripts/build/binary_onie
@@ -27,7 +27,7 @@ then
exit 0
fi
-case "${LIVE_IMAGE_TYPE}" in
+case "${LB_IMAGE_TYPE}" in
iso)
IMAGE="${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.iso"
;;
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 84a32cd31..3df40d0d5 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -48,7 +48,7 @@ case "${LB_INITRAMFS}" in
esac
# Assembling image specifics
-case "${LIVE_IMAGE_TYPE}" in
+case "${LB_IMAGE_TYPE}" in
iso|iso-hybrid)
_BOOTLOADER="isolinux"
_TARGET="binary/isolinux"
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
index c6e074e34..4cac3aa35 100755
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if [ "${LIVE_IMAGE_TYPE}" != "tar" ]; then
+if [ "${LB_IMAGE_TYPE}" != "tar" ]; then
exit 0
fi
diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync
index 499d7bead..937eedd4e 100755
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@@ -21,7 +21,7 @@ USAGE="${PROGRAM} [--force]"
# Processing arguments and configuration files
Init_config_data "${@}"
-if [ "${LIVE_IMAGE_TYPE}" != "iso" ] && [ "${LIVE_IMAGE_TYPE}" != "iso-hybrid" ]
+if [ "${LB_IMAGE_TYPE}" != "iso" ] && [ "${LB_IMAGE_TYPE}" != "iso-hybrid" ]
then
exit 0
fi
@@ -51,7 +51,7 @@ Restore_package_cache binary
# Installing depends
Install_package
-case "${LIVE_IMAGE_TYPE}" in
+case "${LB_IMAGE_TYPE}" in
iso)
_IMAGES="${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.iso"
;;
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index bd8a3e230..3f27ad8b0 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -32,7 +32,7 @@ Check_stagefile
# Acquire lock file
Acquire_lockfile
-case "${LIVE_IMAGE_TYPE}" in
+case "${LB_IMAGE_TYPE}" in
netboot)
if [ ! -f chroot/sbin/mount.cifs ]
then
diff --git a/scripts/build/config b/scripts/build/config
index b78557476..4f7f5960f 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -378,7 +378,7 @@ Local_arguments ()
;;
-b|--binary-image|--binary-images)
- LIVE_IMAGE_TYPE="${2}"
+ LB_IMAGE_TYPE="${2}"
shift 2
;;
@@ -1205,8 +1205,8 @@ mkdir -p config/bootloaders
cat > config/binary << EOF
# config/binary - options for live-build(7), binary stage
-# \$LIVE_IMAGE_TYPE: set image type
-LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE}"
+# \$LB_IMAGE_TYPE: set image type
+LB_IMAGE_TYPE="${LB_IMAGE_TYPE}"
# \$LB_BINARY_FILESYSTEM: set image filesystem
LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM}"
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 50ff5c980..97128fb35 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -60,7 +60,7 @@ else
fi
# Setting destination directory
-case "${LIVE_IMAGE_TYPE}" in
+case "${LB_IMAGE_TYPE}" in
netboot)
DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURE}"
;;
@@ -76,7 +76,7 @@ case "${LB_DEBIAN_INSTALLER}" in
DI_IMAGE_TYPE="netboot"
;;
*)
- case "${LIVE_IMAGE_TYPE}" in
+ case "${LB_IMAGE_TYPE}" in
netboot)
DI_IMAGE_TYPE="netboot"
;;
@@ -734,7 +734,7 @@ EOF
DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION_BINARY}"
fi
- case "${LIVE_IMAGE_TYPE}" in
+ case "${LB_IMAGE_TYPE}" in
hdd)
case "${LB_BINARY_FILESYSTEM}" in
fat*|ntfs)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 20:39:27 +0000