diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2019-10-16 10:58:44 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2019-10-16 10:58:44 +0300 |
| commit | dc2a7dc6b996bfc042fc1280e6883b459fc739e3 (patch) | |
| tree | 3b56d707b3d936855c037cabbfcab81a9a1a34d1 /ledge | |
| parent | 572fed14bf0c44501a975641653cdee934b15928 (diff) | |
ledge-oe: get rid of piped basename
find can print base name of the file. No need to exec basename
after that. This is cosmetic thing but less chances that basename
utility will fail due to wrong ouput from find.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Change-Id: I8d419c78761670fbb9f3f5651356157c607fb6a6
Diffstat (limited to 'ledge')
| -rwxr-xr-x | ledge/oe/builders.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ledge/oe/builders.sh b/ledge/oe/builders.sh index 75f4b8a2..9d19dcc2 100755 --- a/ledge/oe/builders.sh +++ b/ledge/oe/builders.sh @@ -204,18 +204,18 @@ TUNE_FEATURES=$(bitbake -e | grep "^TUNE_FEATURES="| cut -d'=' -f2 | tr -d '"') STAGING_KERNEL_DIR=$(bitbake -e | grep "^STAGING_KERNEL_DIR="| cut -d'=' -f2 | tr -d '"') ls -lh ${DEPLOY_DIR_IMAGE} -BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*${MACHINE}-*${BUILD_NUMBER}*.img" | sort | xargs -r basename) -KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*${MACHINE}-*.bin" | xargs -r basename) -ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) -ROOTFS_EXT4=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename) -ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename) -HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.hddimg.xz" | xargs -r basename) +BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*${MACHINE}-*${BUILD_NUMBER}*.img" -printf "%f\n"| sort) +KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*${MACHINE}-*.bin" -printf "%f\n") +ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.rootfs.img.gz" -printf "%f\n" ) +ROOTFS_EXT4=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.rootfs.ext4.gz" -printf "%f\n") +ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.rootfs.tar.xz" -printf "%f\n") +HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "ledge-*${MACHINE}-*${BUILD_NUMBER}.hddimg.xz" -printf "%f\n") INITRD_URL="" case "${MACHINE}" in ledge-am57xx-evm) # QEMU arm 32bit needs the zImage file, not the uImage file. # KERNEL_IMG is not used for the real hardware itself. - KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage-*${MACHINE}-*${BUILD_NUMBER}.bin" | xargs -r basename) + KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage-*${MACHINE}-*${BUILD_NUMBER}.bin" -printf "%f\n") ;; ledge-synquacer) INITRD_URL="http://images.validation.linaro.org/synquacer/hc/initrd.img" @@ -228,10 +228,10 @@ case "${MACHINE}" in RIMAGE=ledge-stm32mp157c-dk2.tar.gz # Only use the iot flashlayout to deploy, since it's a superset of the # gateway image - FLASH_LAYOUT=$(find ${DEPLOY_DIR_IMAGE} -type f -name "FlashLayout_sdcard_${MACHINE}-*iot-lava*.tsv" | xargs -r basename) + FLASH_LAYOUT=$(find ${DEPLOY_DIR_IMAGE} -type f -name "FlashLayout_sdcard_${MACHINE}-*iot-lava*.tsv" -printf "%f\n") ;; juno) - DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*${MACHINE}*-${BUILD_NUMBER}.dtb" | xargs -r basename) + DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*${MACHINE}*-${BUILD_NUMBER}.dtb" -printf "%f\n") ;; esac |