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/combined-image.sh | |
| parent | ce8af0ace04bb43e8156940c771b4058fa83d27a (diff) | |
| download | openwrt-b993b68b6ca8444b5227a0c18df4600b37ac565c.tar.gz openwrt-b993b68b6ca8444b5227a0c18df4600b37ac565c.tar.bz2 openwrt-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/combined-image.sh')
| -rwxr-xr-x | scripts/combined-image.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combined-image.sh b/scripts/combined-image.sh index 4e00cb89a2..a365fbc536 100755 --- a/scripts/combined-image.sh +++ b/scripts/combined-image.sh @@ -16,7 +16,7 @@ dd if="$1" of="$kern" bs=$BLKSZ conv=sync 2>/dev/null dd if="$2" of="$root" bs=$BLKSZ conv=sync 2>/dev/null # Calculate md5sum over combined kernel and rootfs image. -md5=$(cat "$kern" "$root" | mkhash md5) +md5=$(cat "$kern" "$root" | $MKHASH md5) # Write image header followed by kernel and rootfs image. # The header is padded to 64k, format is: |