summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xfunctions/packages.sh50
-rw-r--r--scripts/build/.grep.swpbin0 -> 4096 bytes
-rwxr-xr-xscripts/build/binary_grub2
-rwxr-xr-xscripts/build/binary_grub22
-rwxr-xr-xscripts/build/binary_hdd14
-rwxr-xr-xscripts/build/binary_iso2
-rwxr-xr-xscripts/build/binary_loadlin2
-rwxr-xr-xscripts/build/binary_memtest4
-rwxr-xr-xscripts/build/binary_netboot2
-rwxr-xr-xscripts/build/binary_package-lists4
-rwxr-xr-xscripts/build/binary_rootfs6
-rwxr-xr-xscripts/build/binary_syslinux6
-rwxr-xr-xscripts/build/binary_win32-loader2
-rwxr-xr-xscripts/build/binary_zsync2
-rwxr-xr-xscripts/build/bootstrap_debootstrap2
-rwxr-xr-xscripts/build/chroot_archives2
-rwxr-xr-xscripts/build/chroot_package-lists2
-rwxr-xr-xscripts/build/chroot_preseed2
-rwxr-xr-xscripts/build/installer_debian-installer4
-rwxr-xr-xscripts/build/source_hdd4
-rwxr-xr-xscripts/build/source_iso2
21 files changed, 57 insertions, 59 deletions
diff --git a/functions/packages.sh b/functions/packages.sh
index 4211c0eaa..ebbeb4aa8 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -10,10 +10,11 @@
Check_package ()
{
- FILE="${1}"
- PACKAGE="${2}"
+ CHROOT="${1}"
+ FILE="${2}"
+ PACKAGE="${3}"
- Check_installed "${FILE}" "${PACKAGE}"
+ Check_installed "${CHROOT}" "${FILE}" "${PACKAGE}"
case "${INSTALL_STATUS}" in
1)
@@ -66,38 +67,35 @@ Remove_package ()
# 2 if package isn't installed and we aren't in an apt managed system
Check_installed ()
{
- FILE="${1}"
- PACKAGE="${2}"
+ CHROOT="${1}"
+ FILE="${2}"
+ PACKAGE="${3}"
- case "${LB_BUILD_WITH_CHROOT}" in
- true)
+ if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] && [ "${CHROOT}" = "chroot" ]
+ then
+ if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
+ then
+ INSTALL_STATUS=0
+ else
+ INSTALL_STATUS=1
+ fi
+ else
+ if which dpkg-query > /dev/null 2>&1
+ then
if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
then
INSTALL_STATUS=0
else
INSTALL_STATUS=1
fi
- ;;
- false)
- if which dpkg-query > /dev/null 2>&1
+ else
+ if [ ! -e "${FILE}" ]
then
- if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
- then
- INSTALL_STATUS=0
- else
- INSTALL_STATUS=1
- fi
+ INSTALL_STATUS=2
else
- FILE="$(echo ${FILE} | sed -e 's|chroot||')"
-
- if [ ! -e "${FILE}" ]
- then
- INSTALL_STATUS=2
- else
- INSTALL_STATUS=0
- fi
+ INSTALL_STATUS=0
fi
- ;;
- esac
+ fi
+ fi
}
diff --git a/scripts/build/.grep.swp b/scripts/build/.grep.swp
new file mode 100644
index 000000000..ccbb0c895
--- /dev/null
+++ b/scripts/build/.grep.swp
Binary files differ
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index c311c12a8..fcb386e4a 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -51,7 +51,7 @@ Check_architectures amd64 i386
Check_crossarchitectures
# Checking depends
-Check_package chroot/usr/sbin/grub grub-legacy
+Check_package chroot /usr/sbin/grub grub-legacy
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index bf5f8cecf..3c8049e50 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -51,7 +51,7 @@ Check_architectures amd64 i386
Check_crossarchitectures
# Checking depends
-Check_package chroot/usr/bin/grub-mkimage grub-pc
+Check_package chroot /usr/bin/grub-mkimage grub-pc
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 90cd3e9d0..0e08b9e79 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -46,22 +46,22 @@ Create_lockfile .lock
# Checking depends
case "${LB_BINARY_FILESYSTEM}" in
fat*)
- Check_package chroot/sbin/mkdosfs dosfstools
+ Check_package chroot /sbin/mkdosfs dosfstools
;;
ntfs)
- Check_package chroot/sbin/mkfs.nfts ntfs-3g
+ Check_package chroot /sbin/mkfs.nfts ntfs-3g
;;
esac
-Check_package chroot/usr/share/doc/mtools mtools
-Check_package chroot/sbin/parted parted
+Check_package chroot /usr/share/doc/mtools mtools
+Check_package chroot /sbin/parted parted
if [ "${LB_ARCHITECTURES}" = "sparc" ]
then
case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3|ext4)
- Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs
+ Check_package chroot /sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs
;;
*)
@@ -73,7 +73,7 @@ fi
case "${LB_BOOTLOADER}" in
grub)
- Check_package chroot/usr/sbin/grub grub
+ Check_package chroot /usr/sbin/grub grub
;;
syslinux)
@@ -89,7 +89,7 @@ case "${LB_BOOTLOADER}" in
exit 1
;;
esac
- Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
+ Check_package chroot /usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
;;
esac
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 9b173790c..8475c8824 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -53,7 +53,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Checking depends
-Check_package chroot/usr/bin/xorriso xorriso
+Check_package chroot /usr/bin/xorriso xorriso
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin
index e771c2931..968d5b309 100755
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@@ -48,7 +48,7 @@ case "${LB_ARCHITECTURES}" in
case "${LB_BUILD_WITH_CHROOT}" in
true)
# Checking depends
- Check_package chroot/usr/lib/loadlin/loadlin.exe.gz loadlin
+ Check_package chroot /usr/lib/loadlin/loadlin.exe.gz loadlin
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 5e8d1752b..840e6be5b 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -64,11 +64,11 @@ fi
# Checking depends
case "${LB_MEMTEST}" in
memtest86)
- Check_package chroot/boot/memtest86.bin memtest86
+ Check_package chroot /boot/memtest86.bin memtest86
;;
memtest86+)
- Check_package chroot/boot/memtest86+.bin memtest86+
+ Check_package chroot /boot/memtest86+.bin memtest86+
;;
esac
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot
index 2290ac10d..6de12fc27 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -51,7 +51,7 @@ Create_lockfile .lock
if [ "${LB_ARCHITECTURES}" = "sparc" ]
then
# Checking depends
- Check_package chroot/usr/bin/elftoaout sparc-utils
+ Check_package chroot /usr/bin/elftoaout sparc-utils
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index ff19c3c6c..91ff72e9d 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -59,8 +59,8 @@ then
Restore_cache cache/packages.chroot
# Check depends
- Check_package chroot/usr/bin/apt-ftparchive apt-utils
- Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+ Check_package chroot /usr/bin/apt-ftparchive apt-utils
+ Check_package chroot /usr/bin/grep-aptavail dctrl-tools
# Installing depends
Install_package
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index e950505fb..c1e4ec8e0 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -85,7 +85,7 @@ done
case "${LB_CHROOT_FILESYSTEM}" in
ext2|ext3|ext4)
# Checking depends
- Check_package chroot/sbin/mkfs.${LB_CHROOT_FILESYSTEM} e2fsprogs
+ Check_package chroot /sbin/mkfs.${LB_CHROOT_FILESYSTEM} e2fsprogs
# Restoring cache
Restore_cache cache/packages.binary
@@ -211,7 +211,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
jffs2)
# Checking depends
- Check_package chroot/usr/sbin/mkfs.jffs2 mtd-tools
+ Check_package chroot /usr/sbin/mkfs.jffs2 mtd-tools
# Restoring cache
Restore_cache cache/packages.binary
@@ -310,7 +310,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
squashfs)
# Checking depends
- Check_package chroot/usr/share/doc/squashfs-tools squashfs-tools
+ Check_package chroot /usr/share/doc/squashfs-tools squashfs-tools
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index e939cf4b4..daeb61318 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -123,12 +123,12 @@ fi
# Checking depends
case "${LB_BUILD_WITH_CHROOT}" in
true)
- Check_package chroot/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
- Check_package chroot/usr/lib/syslinux syslinux-common
+ Check_package chroot /usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
+ Check_package chroot /usr/lib/syslinux syslinux-common
if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
then
- Check_package chroot/usr/bin/rsvg-convert librsvg2-bin
+ Check_package chroot /usr/bin/rsvg-convert librsvg2-bin
fi
;;
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 401144687..7855110f7 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -48,7 +48,7 @@ case "${LB_ARCHITECTURES}" in
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Checking depends
- Check_package chroot/usr/share/win32/win32-loader.exe win32-loader
+ Check_package chroot /usr/share/win32/win32-loader.exe win32-loader
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync
index fd2fe01a7..efd703a65 100755
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@@ -49,7 +49,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Checking depends
-Check_package chroot/usr/bin/zsyncmake zsync
+Check_package chroot /usr/bin/zsyncmake zsync
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index 36b441e85..0863a7334 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -37,7 +37,7 @@ Check_crossarchitectures
Echo_message "Begin bootstrapping system..."
-Check_package /usr/sbin/debootstrap debootstrap
+Check_package chroot bin/debootstrap debootstrap
# Checking stage file
Check_stagefile .build/bootstrap
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 59f1b6318..0a66e2706 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -275,7 +275,7 @@ EOF
fi
# Check depends
- Check_package chroot/usr/bin/apt-ftparchive apt-utils
+ Check_package chroot /usr/bin/apt-ftparchive apt-utils
# Installing depends
Install_package
diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists
index 072343c8e..3ad1d7946 100755
--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@@ -52,7 +52,7 @@ fi
case "${LB_BUILD_WITH_CHROOT}" in
true)
# Checking depends
- Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+ Check_package chroot /usr/bin/grep-aptavail dctrl-tools
# Restoring cache
Restore_cache cache/packages.chroot
diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed
index 4ef772957..7fd43cdf9 100755
--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@@ -43,7 +43,7 @@ if ls config/preseed/*.cfg > /dev/null 2>&1 || \
ls chroot/root/packages.chroot.cfg > /dev/null 2>&1
then
# Check dependency
- Check_package chroot/usr/bin/debconf-set-selections debconf
+ Check_package chroot /usr/bin/debconf-set-selections debconf
# Install dependency
Install_package
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 5146ede5b..0d4a3c0ba 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -64,8 +64,8 @@ Check_lockfile .lock
Create_lockfile .lock
# Checking depends
-Check_package chroot/usr/bin/wget wget
-Check_package chroot/usr/bin/apt-ftparchive apt-utils
+Check_package chroot /usr/bin/wget wget
+Check_package chroot /usr/bin/apt-ftparchive apt-utils
# Restoring cache
Restore_cache cache/packages.binary
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd
index 022c1e186..c932034cf 100755
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@@ -49,8 +49,8 @@ Check_lockfile .lock
Create_lockfile .lock
# Checking depends
-Check_package chroot/sbin/mkdosfs dosfstools
-Check_package chroot/sbin/parted parted
+Check_package chroot /sbin/mkdosfs dosfstools
+Check_package chroot /sbin/parted parted
# Installing depends
Install_package
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index 3896e00dd..8c6300c11 100755
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@@ -53,7 +53,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Checking depends
-Check_package chroot/usr/bin/xorriso xorriso
+Check_package chroot /usr/bin/xorriso xorriso
# Installing depends
Install_package
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 05:22:40 +0000