From 81adab855557a99d17110d9ffe5325cf774350d9 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 26 Mar 2020 06:29:03 +0000 Subject: syslinux: simplification `$_SOURCE` is always composed of `/${_BOOTLOADER}`, so we can just use `${_BOOTLOADER}` as the basename, without calling `basename ${_SOURCE}` Gbp-Dch: Ignore --- scripts/build/binary_syslinux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 72116e5ce..357267d14 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -114,9 +114,9 @@ case "${LB_BUILD_WITH_CHROOT}" in # Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly cp -a ${_SOURCE} chroot/root - Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp > /dev/null 2>&1 || true - cp -a chroot/root/$(basename ${_SOURCE}).tmp/* ${_TARGET} - rm -rf chroot/root/$(basename ${_SOURCE}) chroot/root/$(basename ${_SOURCE}).tmp + Chroot chroot cp -aL /root/${_BOOTLOADER} /root/${_BOOTLOADER}.tmp > /dev/null 2>&1 || true + cp -a chroot/root/${_BOOTLOADER}.tmp/* ${_TARGET} + rm -rf chroot/root/${_BOOTLOADER} chroot/root/${_BOOTLOADER}.tmp ;; false) -- cgit v1.2.3