From 1edfa43bf5cab73cbc33f5dfdcf3022ff089ffbb Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 26 Aug 2022 14:42:10 +0300 Subject: [PATCH 1/4] Fix check_uclibc_feature definition --- .github/workflows/matrix_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index 84eea60a..1a8ccd65 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -394,7 +394,7 @@ jobs: echo Using $TOOLNAME if [ ! -f "$TOOLNAME.tgz" ]; then - wget --retry-on-http-error=503 \ + wget -nv --retry-on-http-error=503 --continue --timeout=15 \ https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${TOOLNAME}.tgz fi mkdir /tmp/extsdk @@ -425,7 +425,7 @@ jobs: uclibc) PREFIX="${PREFIX}${LIBC}gnu${ABI}" UCCFG=/tmp/extsdk/${PREFIX}/sysroot/usr/include/bits/uClibc_config.h - check_uclibc_feature() { grep -q "\#define ${1} 1" ${UCCFG} && echo y || echo n } + check_uclibc_feature () { grep -q "\#define ${1} 1" ${UCCFG} && echo y || echo n; } echo "BR2_ENABLE_LOCALE=$(check_uclibc_feature __UCLIBC_HAS_LOCALE__)" >> $CONF_PATH echo "BR2_TOOLCHAIN_HAS_THREADS_DEBUG=$(check_uclibc_feature __PTHREADS_DEBUG_SUPPORT__)" >> $CONF_PATH ;; From fcf45ef7d179fb8a87258f4a97ed0f5f3d95cc53 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 26 Aug 2022 19:52:09 +0300 Subject: [PATCH 2/4] Add special case for failed builds --- .github/workflows/matrix_build.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index 1a8ccd65..40c235a9 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -399,6 +399,7 @@ jobs: fi mkdir /tmp/extsdk tar xvf ${TOOLNAME}.tgz --strip-components=1 -C /tmp/extsdk >/dev/null + set -x echo "BR2_TOOLCHAIN_EXTERNAL=y" >> $CONF_PATH echo "BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y" >> $CONF_PATH @@ -425,6 +426,7 @@ jobs: uclibc) PREFIX="${PREFIX}${LIBC}gnu${ABI}" UCCFG=/tmp/extsdk/${PREFIX}/sysroot/usr/include/bits/uClibc_config.h + ls -la $UCCFG check_uclibc_feature () { grep -q "\#define ${1} 1" ${UCCFG} && echo y || echo n; } echo "BR2_ENABLE_LOCALE=$(check_uclibc_feature __UCLIBC_HAS_LOCALE__)" >> $CONF_PATH echo "BR2_TOOLCHAIN_HAS_THREADS_DEBUG=$(check_uclibc_feature __PTHREADS_DEBUG_SUPPORT__)" >> $CONF_PATH @@ -460,6 +462,14 @@ jobs: } if [ -f uImage ]; then + # TODO: doesn't fit to lite + case ${{ matrix.platform }} in + hi3516cv500|hi3516dv300|hi3516av300) + MAX_KERNEL_SIZE=${MAX_KERNEL_SIZE_ULTIMATE} + MAX_ROOTFS_SIZE=${MAX_ROOTFS_SIZE_ULTIMATE} + ;; + esac + case ${{ matrix.release }} in lite) check_exceeded uImage ${MAX_KERNEL_SIZE} @@ -492,7 +502,16 @@ jobs: mv rootfs.ubi rootfs.ubi.${{ matrix.platform }} md5sum rootfs.ubifs > rootfs.ubifs.${{ matrix.platform }}.md5sum mv rootfs.ubifs rootfs.ubifs.${{ matrix.platform }} - tar -cvzf $NANDFW_PATH uImage* *rootfs.ubi*.${{ matrix.platform }}* + case ${{ matrix.platform }} in + rv*) + mv zboot.img boot.img.${{ matrix.platform }} + md5sum boot.img.${BOARD} > boot.img.${BOARD}.md5sum + tar -cvzf $NANDFW_PATH boot.img* *rootfs.ubi*.${{ matrix.platform }}* + ;; + *) + tar -cvzf $NANDFW_PATH uImage* *rootfs.ubi*.${{ matrix.platform }}* + ;; + esac fi popd From 041d1572a72808e10d535510605fdb3161057938 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 26 Aug 2022 22:16:08 +0300 Subject: [PATCH 3/4] Fix rv typo --- .github/workflows/matrix_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index 40c235a9..ca280140 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -505,7 +505,7 @@ jobs: case ${{ matrix.platform }} in rv*) mv zboot.img boot.img.${{ matrix.platform }} - md5sum boot.img.${BOARD} > boot.img.${BOARD}.md5sum + md5sum boot.img.${{ matrix.platform }} > boot.img.${{ matrix.platform }}.md5sum tar -cvzf $NANDFW_PATH boot.img* *rootfs.ubi*.${{ matrix.platform }}* ;; *) From 26ddf7da92f930b1923a9fed05984162eaf511eb Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 26 Aug 2022 22:36:58 +0300 Subject: [PATCH 4/4] Add more debug --- .github/workflows/matrix_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index ca280140..bbd95af6 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -446,6 +446,7 @@ jobs: GCC_VER=$(echo $TOOLNAME | cut -d '-' -f 2) echo "BR2_TOOLCHAIN_EXTERNAL_GCC_${GCC_VER:3:1}=y" >> $CONF_PATH echo "BR2_ROOTFS_POST_BUILD_SCRIPT=\"\$(TOPDIR)/../scripts/executing_commands_for_${LIBC}.sh\"" >> $CONF_PATH + cat $CONF_PATH make BOARD=$BOARD all