OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Use specific BR version for specific platforms (#494)

pull/497/head
Dmitry Ilyin 2022-09-28 18:53:06 +03:00 committed by GitHub
parent 0de21138e0
commit e3f07ba913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/matrix_build.yml vendored
View File

@ -83,8 +83,9 @@ jobs:
echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV
echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
make prepare BOARD=unknown_unknown_${{ matrix.platform }}_openipc
TOOLNAME=$(make BOARD=unknown_unknown_${{ matrix.platform }}_openipc toolname) make BOARD=$BOARD prepare
TOOLNAME=$(make BOARD=$BOARD toolname)
echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV
URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${TOOLNAME}.tgz URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${TOOLNAME}.tgz
echo Checking $URL echo Checking $URL
@ -368,8 +369,9 @@ jobs:
- name: Determine toolchain name - name: Determine toolchain name
run: | run: |
make prepare BOARD=unknown_unknown_${{ matrix.platform }}_openipc
TOOLNAME=$(make BOARD=unknown_unknown_${{ matrix.platform }}_openipc toolname) make BOARD=$BOARD prepare
TOOLNAME=$(make BOARD=$BOARD toolname)
echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
@ -434,6 +436,9 @@ jobs:
;; ;;
glibc) glibc)
PREFIX="${PREFIX}gnu${ABI}" PREFIX="${PREFIX}gnu${ABI}"
RPCH=/tmp/extsdk/${PREFIX}/sysroot/usr/include/rpc/rpc.h
check_glibc_rpc_feature() { test -f $RPCH && echo y || echo n ; }
echo "${TLEXT}_INET_RPC=$(check_glibc_rpc_feature)" >> $CONF_PATH
;; ;;
esac esac
echo "${TLEXT}_CUSTOM_PREFIX=\"${PREFIX}\"" >> $CONF_PATH echo "${TLEXT}_CUSTOM_PREFIX=\"${PREFIX}\"" >> $CONF_PATH

23
Makefile
View File

@ -1,9 +1,6 @@
ifneq ($(PLATFORM),)
ROOT_DIR := $(CURDIR) PLATFORM := $(error Setting PLATFORM in make arguments is deprecated, please remove it)
BR_VER ?= 2020.02.12 else
BR_DIR := $(ROOT_DIR)/buildroot-$(BR_VER)
ifeq ($(PLATFORM),)
ifneq ($(BOARD),) ifneq ($(BOARD),)
FULL_PATH := $(shell find br-ext-chip-* -name "$(BOARD)*_defconfig") FULL_PATH := $(shell find br-ext-chip-* -name "$(BOARD)*_defconfig")
ifeq ($(FULL_PATH),) ifeq ($(FULL_PATH),)
@ -13,12 +10,24 @@ ifeq ($(PLATFORM),)
endif endif
PLATFORM := $(shell echo $(FULL_PATH) | cut -d '/' -f 1 | cut -d '-' -f 4 ) PLATFORM := $(shell echo $(FULL_PATH) | cut -d '/' -f 1 | cut -d '-' -f 4 )
FAMILY := $(shell grep "/board/" $(FULL_PATH) | head -1 | cut -d "/" -f 3)
ifeq ($(FAMILY),hi3516cv500)
BR_VER ?= 2021.02.12
endif
endif endif
endif endif
ROOT_DIR := $(CURDIR)
BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-$(PLATFORM) BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-$(PLATFORM)
SCRIPTS_DIR := $(ROOT_DIR)/scripts SCRIPTS_DIR := $(ROOT_DIR)/scripts
#BOARDS := $(shell ls -1 $(BR_EXT_DIR)/configs)
BR_VER ?= 2020.02.12
BR_DIR := $(ROOT_DIR)/buildroot-$(BR_VER)
ifeq ($(BR_VER),2021.02.12)
DUMMY := $(shell rm general/package/all-patches/m4/0003-c-stack-stop-using-SIGSTKSZ.patch 2>/dev/null)
endif
.PHONY: usage help clean distclean prepare install-deps all toolchain-params run-tests overlayed-rootfs-% .PHONY: usage help clean distclean prepare install-deps all toolchain-params run-tests overlayed-rootfs-%