From ffdd6878a38057b2bcf1f29e93b37f4d3ef83fc3 Mon Sep 17 00:00:00 2001 From: kszaq Date: Fri, 3 May 2019 23:51:27 +0200 Subject: [PATCH] linux: use PKG_UIMAGE_*ADDR for the used address If a package is sources multiple times, the destination address may be recalculated and overwritten a few times. Prevent this by using PKG-prefixed variables for results. Thanks to MilhouseVH for suggesting this. --- packages/linux/package.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 0ac70ded6b..f04b74518e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -255,16 +255,19 @@ make_target() { COMPRESSED_SIZE=$(stat -t "arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET" | awk '{print $2}') # align to 1 MiB COMPRESSED_SIZE=$(( (($COMPRESSED_SIZE - 1 >> 20) + 1) << 20 )) - KERNEL_UIMAGE_LOADADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_LOADADDR + $COMPRESSED_SIZE ))") - KERNEL_UIMAGE_ENTRYADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_ENTRYADDR + $COMPRESSED_SIZE ))") + PKG_KERNEL_UIMAGE_LOADADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_LOADADDR + $COMPRESSED_SIZE ))") + PKG_KERNEL_UIMAGE_ENTRYADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_ENTRYADDR + $COMPRESSED_SIZE ))") + else + PKG_KERNEL_UIMAGE_LOADADDR=${KERNEL_UIMAGE_LOADADDR} + PKG_KERNEL_UIMAGE_ENTRYADDR=${KERNEL_UIMAGE_ENTRYADDR} fi mkimage -A $TARGET_KERNEL_ARCH \ -O linux \ -T kernel \ -C $KERNEL_UIMAGE_COMP \ - -a $KERNEL_UIMAGE_LOADADDR \ - -e $KERNEL_UIMAGE_ENTRYADDR \ + -a $PKG_KERNEL_UIMAGE_LOADADDR \ + -e $PKG_KERNEL_UIMAGE_ENTRYADDR \ -d arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET \ arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_UIMAGE_TARGET fi