From 21242451c265f3b2fb47e710a5fabc74dc59efce Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 30 Jan 2023 18:37:39 +0100 Subject: [PATCH] scripts: size_compare: fix support for CONFIG_BINARY_FOLDER There is no CONFIG_BINARY_DIR, it's CONFIG_BINARY_FOLDER. While at it, don't parse the shell compatible .config, eval it. Signed-off-by: Andre Heider --- scripts/size_compare.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/size_compare.sh b/scripts/size_compare.sh index a5cc3337c74..617004e72bb 100755 --- a/scripts/size_compare.sh +++ b/scripts/size_compare.sh @@ -21,17 +21,20 @@ ### -p --package-size Check IPK package size and not installed size ### -h --help This message -CONFIG_TARGET=$(sed -n 's/^CONFIG_TARGET_BOARD="\(.*\)"$/\1/p' .config) -CONFIG_SUBTARGET=$(sed -n 's/^CONFIG_TARGET_SUBTARGET="\(.*\)"$/\1/p' .config) -CONFIG_ARCH=$(sed -n 's/^CONFIG_TARGET_ARCH_PACKAGES="\(.*\)"$/\1/p' .config) +eval "$(grep \ + -e ^CONFIG_TARGET_BOARD= \ + -e ^CONFIG_TARGET_SUBTARGET= \ + -e ^CONFIG_TARGET_ARCH_PACKAGES= \ + -e ^CONFIG_BINARY_FOLDER= \ + .config 2>/dev/null \ +)" CONFIG_PACKAGES=$(sed -n 's/^CONFIG_PACKAGE_\(.*\)=y$/\1/p' .config | tr '\n' ' ') -CONFIG_BIN_DIR=$(sed -n 's/^CONFIG_BINARY_DIR="\(.*\)"$/\1/p' .config) -TARGET=${TARGET:-$CONFIG_TARGET} -SUBTARGET=${SUBTARGET:-$CONFIG_SUBTARGET} -ARCH=${ARCH:-$CONFIG_ARCH} +TARGET=${TARGET:-$CONFIG_TARGET_BOARD} +SUBTARGET=${SUBTARGET:-$CONFIG_TARGET_SUBTARGET} +ARCH=${ARCH:-$CONFIG_TARGET_ARCH_PACKAGES} PACKAGES=${PACKAGES:-$CONFIG_PACKAGES} -BIN_DIR=${CONFIG_BIN_DIR:-./bin} +BIN_DIR=${CONFIG_BINARY_FOLDER:-./bin} BASE_URL="${BASE_URL:-https://downloads.openwrt.org/snapshots}" CHECK_INSTALLED="${CHECK_INSTALLED:-y}" -- 2.30.2