diff options
| author | Leonardo Mörlein <me@irrelefant.net> | 2021-05-09 22:28:15 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2021-05-13 15:13:15 +0200 |
| commit | b993b68b6ca8444b5227a0c18df4600b37ac565c (patch) | |
| tree | a55300e2e43a57fa46a534d1135eee006a4b6d71 /scripts/om-fwupgradecfg-gen.sh | |
| parent | ce8af0ace04bb43e8156940c771b4058fa83d27a (diff) | |
| download | upstream-b993b68b6ca8444b5227a0c18df4600b37ac565c.tar.gz upstream-b993b68b6ca8444b5227a0c18df4600b37ac565c.tar.bz2 upstream-b993b68b6ca8444b5227a0c18df4600b37ac565c.zip | |
build: introduce $(MKHASH)
Before this commit, it was assumed that mkhash is in the PATH. While
this was fine for the normal build workflow, this led to some issues if
make TOPDIR="$(pwd)" -C "$pkgdir" compile
was called manually. In most of the cases, I just saw warnings like this:
make: Entering directory '/home/.../package/gluon-status-page'
bash: line 1: mkhash: command not found
bash: line 1: mkhash: command not found
bash: line 1: mkhash: command not found
bash: line 1: mkhash: command not found
bash: line 1: mkhash: command not found
bash: line 1: mkhash: command not found
bash: line 1: mkhash: command not found
bash: line 1: mkhash: command not found
[...]
While these were only warnings and the package still compiled sucessfully,
I also observed that some package even fail to build because of this.
After applying this commit, the variable $(MKHASH) is introduced. This
variable points to $(STAGING_DIR_HOST)/bin/mkhash, which is always the
correct path.
Signed-off-by: Leonardo Mörlein <me@irrelefant.net>
Diffstat (limited to 'scripts/om-fwupgradecfg-gen.sh')
| -rwxr-xr-x | scripts/om-fwupgradecfg-gen.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/om-fwupgradecfg-gen.sh b/scripts/om-fwupgradecfg-gen.sh index bf7c047c5b..c3858416a6 100755 --- a/scripts/om-fwupgradecfg-gen.sh +++ b/scripts/om-fwupgradecfg-gen.sh @@ -54,8 +54,8 @@ esac CHECK_BS=65536 KERNEL_SIZE=$(stat -c%s "$KERNEL_PATH") -KERNEL_MD5=$(mkhash md5 $KERNEL_PATH) -KERNEL_SHA256=$(mkhash sha256 $KERNEL_PATH) +KERNEL_MD5=$($MKHASH md5 $KERNEL_PATH) +KERNEL_SHA256=$($MKHASH sha256 $KERNEL_PATH) KERNEL_PART_SIZE_KB=$((KERNEL_SIZE / 1024)) KERNEL_PART_SIZE=$(printf $SIZE_FORMAT $(($KERNEL_PART_SIZE_KB * $SIZE_FACTOR))) @@ -63,9 +63,9 @@ ROOTFS_FLASH_ADDR=$(addr=$(($KERNEL_FLASH_ADDR + ($KERNEL_PART_SIZE_KB * 1024))) ROOTFS_SIZE=$(stat -c%s "$ROOTFS_PATH") ROOTFS_SQUASHFS_SIZE=$((ROOTFS_SIZE-4)) ROOTFS_CHECK_BLOCKS=$((ROOTFS_SQUASHFS_SIZE / CHECK_BS)) -ROOTFS_MD5=$(dd if=$ROOTFS_PATH bs=$CHECK_BS count=$ROOTFS_CHECK_BLOCKS 2>&- | mkhash md5) -ROOTFS_MD5_FULL=$(mkhash md5 $ROOTFS_PATH) -ROOTFS_SHA256_FULL=$(mkhash sha256 $ROOTFS_PATH) +ROOTFS_MD5=$(dd if=$ROOTFS_PATH bs=$CHECK_BS count=$ROOTFS_CHECK_BLOCKS 2>&- | $MKHASH md5) +ROOTFS_MD5_FULL=$($MKHASH md5 $ROOTFS_PATH) +ROOTFS_SHA256_FULL=$($MKHASH sha256 $ROOTFS_PATH) ROOTFS_CHECK_SIZE=$(printf '0x%x' $ROOTFS_SQUASHFS_SIZE) ROOTFS_PART_SIZE_KB=$(($MAX_PART_SIZE - $KERNEL_PART_SIZE_KB)) ROOTFS_PART_SIZE=$(printf $SIZE_FORMAT $(($ROOTFS_PART_SIZE_KB * $SIZE_FACTOR))) |