From b7ba5fc80c0a5e5cf65de5acf6b1b2f430bee251 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Wed, 17 Aug 2022 09:43:07 +0300 Subject: [PATCH] [ci skip] Keep BR_VER in one place --- Makefile | 3 +++ building.sh | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8b2cbc33..96c4c243 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,9 @@ install-deps: $(eval CHIP := $(shell echo $@ | cut -d "_" -f 3)) @cat $(BR_EXT_DIR)/board/$(FAMILY)/$(CHIP).config +buildroot-version: + @echo $(BR_VER) + has-nand: @sed -rn "s/^BR2_TARGET_ROOTFS_UBI=(y)/\1/p" $(FULL_PATH) diff --git a/building.sh b/building.sh index a38960ff..940f2170 100755 --- a/building.sh +++ b/building.sh @@ -7,8 +7,6 @@ # Constants # -BR_VER=2020.02.12 - MAX_KERNEL_SIZE=0x200000 # 2MiB, 2097152 MAX_KERNEL_SIZE_ULTIMATE=0x300000 # 3MiB, 3145728 MAX_KERNEL_SIZE_EXPERIMENTAL=0x3E8480 # ~3.9MiB, 4097152 @@ -51,6 +49,8 @@ clone() { } fresh() { + BR_VER=$1 + if [ -d "$SRC_CACHE_DIR" ]; then echo_c 36 "Found cache directory." else @@ -296,7 +296,7 @@ uni_build() { echo_c 33 "\n SoC: $SOC\nBoard: $BOARD\n" - fresh + fresh $(make BOARD=unknown_unknown_${BOARD} buildroot-version) log_and_run "make BOARD=unknown_unknown_${BOARD} all" if [ "$BOARD" == "ssc335_initramfs" ]; then @@ -335,4 +335,3 @@ fi echo_c 37 "Building OpenIPC ${CMD}" uni_build $CMD -