Remove unknown_unknown and use rename profile openipc -> lite (#509)

pull/510/head
Dmitry Ilyin 2022-10-10 14:07:34 +03:00 committed by GitHub
parent 4c7fe708fe
commit f688a9e452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 12 additions and 17 deletions

View File

@ -83,7 +83,7 @@ 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
BOARD=unknown_unknown_${{ matrix.platform }}_openipc BOARD=${{ matrix.platform }}_lite
make BOARD=$BOARD prepare make BOARD=$BOARD prepare
TOOLNAME=$(make BOARD=$BOARD toolname) TOOLNAME=$(make BOARD=$BOARD toolname)
echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV
@ -116,7 +116,7 @@ jobs:
- name: Build Buildroot SDK - name: Build Buildroot SDK
if: env.NEED == 'true' if: env.NEED == 'true'
run: | run: |
make BOARD=unknown_unknown_${{ matrix.platform }}_openipc br-sdk make BOARD=${{ matrix.platform }}_lite br-sdk
SDK_PATH=$(find output/images -name "*_sdk-buildroot.tar.gz") SDK_PATH=$(find output/images -name "*_sdk-buildroot.tar.gz")
# Why do we need this crap (only for weird artifact names)? # Why do we need this crap (only for weird artifact names)?
NEW="$(dirname $SDK_PATH)/${TOOLNAME}.tgz" NEW="$(dirname $SDK_PATH)/${TOOLNAME}.tgz"
@ -371,7 +371,7 @@ jobs:
- name: Determine toolchain name - name: Determine toolchain name
run: | run: |
BOARD=unknown_unknown_${{ matrix.platform }}_openipc BOARD=${{ matrix.platform }}_lite
make BOARD=$BOARD prepare make BOARD=$BOARD prepare
TOOLNAME=$(make BOARD=$BOARD toolname) TOOLNAME=$(make BOARD=$BOARD toolname)
echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV echo "TOOLNAME=$TOOLNAME" >> $GITHUB_ENV
@ -383,12 +383,12 @@ jobs:
- name: Build firmware - name: Build firmware
run: | run: |
BOARD=unknown_unknown_${{ matrix.platform }} BOARD=${{ matrix.platform }}
if [ "${{ matrix.release }}" != "lite" ]; then if [ "${{ matrix.release }}" != "lite" ]; then
SUFF="${{ matrix.release }}-" SUFF="${{ matrix.release }}-"
BOARD="${BOARD}_${{ matrix.release }}" BOARD="${BOARD}_${{ matrix.release }}"
else else
BOARD="${BOARD}_openipc" BOARD="${BOARD}_lite"
fi fi
CONF_PATH=$(find . -name "${BOARD}_defconfig") CONF_PATH=$(find . -name "${BOARD}_defconfig")

View File

@ -247,20 +247,20 @@ uni_build() {
set -e set -e
if [ "$(echo $BOARD | cut -sd '_' -f 2)" == "" ]; then if [ "$(echo $BOARD | cut -sd '_' -f 2)" == "" ]; then
BOARD="${BOARD}_openipc" BOARD="${BOARD}_lite"
fi fi
if [ "$BOARD" == "hi3518ev200_openipc" ]; then if [ "$BOARD" == "hi3518ev200_lite" ]; then
NEED_AUTOUP=1 NEED_AUTOUP=1
fi fi
echo_c 33 "\n SoC: $SOC\nBoard: $BOARD\n" echo_c 33 "\n SoC: $SOC\nBoard: $BOARD\n"
if [ "all" = "${COMMAND}" ]; then if [ "all" = "${COMMAND}" ]; then
fresh $(make BOARD=unknown_unknown_${BOARD} buildroot-version) fresh $(make BOARD=${BOARD} buildroot-version)
fi fi
log_and_run "make BOARD=unknown_unknown_${BOARD} ${COMMAND}" log_and_run "make BOARD=${BOARD} ${COMMAND}"
if [ "all" = "${COMMAND}" ]; then if [ "all" = "${COMMAND}" ]; then
if [ "$BOARD" == "ssc335_initramfs" ]; then if [ "$BOARD" == "ssc335_initramfs" ]; then
@ -290,7 +290,7 @@ if [ $# -eq 0 ]; then
else else
SELECTED=$(find . -path "*/br-ext-chip-*" -name "*_defconfig" | fzf) SELECTED=$(find . -path "*/br-ext-chip-*" -name "*_defconfig" | fzf)
[ -z "$SELECTED" ] && exit 1 [ -z "$SELECTED" ] && exit 1
BOARD=$(echo $SELECTED | awk -F_ '{printf "%s_%s", $3, $4}') BOARD=$(echo $SELECTED | cut -d / -f 4 | awk -F_ '{printf "%s_%s", $1, $2}')
fi fi
else else
BOARD=$1 BOARD=$1

Some files were not shown because too many files have changed in this diff Show More