From 0c2bfbe299e603f9133c1692ad5dab87bc7d3d9a Mon Sep 17 00:00:00 2001 From: Igor Zalatov Date: Sun, 18 Apr 2021 20:57:26 +0300 Subject: [PATCH 1/4] Build XM530 --- .github/workflows/xm530_images.yml | 129 +++++++++++++++++++++++++++++ Makefile | 4 +- 2 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/xm530_images.yml diff --git a/.github/workflows/xm530_images.yml b/.github/workflows/xm530_images.yml new file mode 100644 index 00000000..134af4c8 --- /dev/null +++ b/.github/workflows/xm530_images.yml @@ -0,0 +1,129 @@ +name: OpenIPC for XM530 + +on: + push: + branches: + - dev + tags: + - "v*" + +jobs: + build_core: + name: OpenIPC v2.0 for XM530 + runs-on: ubuntu-18.04 + + steps: + + - name: Checkout + id: checkout + uses: actions/checkout@v2 + + - name: Install build dependencies + id: install + run: | + make install-deps + mkdir -p tmp + + - name: Free disk space + id: freshing + run: | + sudo swapoff -a + sudo rm -f /swapfile + sudo apt clean + docker rmi $(docker image ls -aq) + df -h + + - name: Prepare buildroot + id: prepare + run: | + HEAD_TAG=$(git tag --points-at HEAD) + GIT_HASH=$(git rev-parse --short $GITHUB_SHA) + BRANCH_NAME=$(echo $GITHUB_REF | cut -d'/' -f 3) + if [ -z "$HEAD_TAG" ]; then + TAG_NAME="latest" + RELEASE_NAME="Development Build" + PRERELEASE=true + else + TAG_NAME=${{ github.ref }} + RELEASE_NAME="Release ${{ github.ref }}" + PRERELEASE=false + fi + echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV + echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV + echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV + echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV + echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV + cd $GITHUB_WORKSPACE + make prepare + + - name: Build XM530 firmware + id: build-xm530-firmware + continue-on-error: true + run: | + ARCHIVE_FW="${GITHUB_WORKSPACE}/output/images/openipc.xm530-br.tgz" + echo "ARCHIVE_FW=$ARCHIVE_FW" >> $GITHUB_ENV + cd $GITHUB_WORKSPACE + make BOARD=unknown_unknown_xm530_openipc all + tar -C ${GITHUB_WORKSPACE}/output/images -cvzf $ARCHIVE_FW rootfs.squashfs uImage + + - name: Build XM530 SDK + id: build-xm530-sdk + continue-on-error: true + run: | + ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-musleabi_sdk-buildroot.tar.gz" + echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV + cd $GITHUB_WORKSPACE/output + make sdk + + - name: Send warning message to telegram channel + env: + TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }} + TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }} + if: steps.build-xm530-firmware.outcome != 'success' || steps.build-xm530-sdk.outcome != 'success' + run: | + TG_OPTIONS="-s --connect-timeout 5 --max-time 15" + TG_NOTIFY="Warning, Buildroot compiling error..." + TG_HEADER=$(echo -e "\r\n$TG_NOTIFY \r\n\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9A\xA0 GitHub Actions") + curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendMessage \ + -F chat_id=$TG_CHANNEL -F text="$TG_HEADER" + + - name: Create release + uses: actions/create-release@v1 + continue-on-error: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.TAG_NAME }} + release_name: ${{ env.RELEASE_NAME }} + draft: false + prerelease: ${{ env.PRERELEASE }} + + - name: Upload FW to release + uses: svenstaro/upload-release-action@v2 + continue-on-error: true + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.ARCHIVE_FW }} + asset_name: "openipc.xm530-br.tgz" + tag: ${{ env.TAG_NAME }} + overwrite: true + + - name: Upload SDK to release + uses: svenstaro/upload-release-action@v2 + continue-on-error: true + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.ARCHIVE_SDK }} + asset_name: "arm-openipc-xm530-linux-musleabi_sdk-buildroot.tar.gz" + tag: ${{ env.TAG_NAME }} + overwrite: true + + - name: Send binary file to telegram channel + env: + TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }} + TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }} + run: | + TG_OPTIONS="-s --connect-timeout 5 --max-time 15" + TG_HEADER=$(echo -e "\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9C\x85 GitHub Actions") + curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendDocument \ + -F chat_id=$TG_CHANNEL -F document="@$ARCHIVE_FW" -F caption="$TG_HEADER" diff --git a/Makefile b/Makefile index c093b2bd..ff928c77 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ ROOT_DIR := $(CURDIR) BR_VER := 2020.02 BR_DIR := $(ROOT_DIR)/buildroot-$(BR_VER) -BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-hisilicon -#BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-xiongmai +#BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-hisilicon +BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-xiongmai SCRIPTS_DIR := $(ROOT_DIR)/scripts BOARDS := $(shell ls -1 $(BR_EXT_DIR)/configs) From c85261ae35979087d9abe60b3529929191645f07 Mon Sep 17 00:00:00 2001 From: Igor Zalatov Date: Sun, 18 Apr 2021 21:01:00 +0300 Subject: [PATCH 2/4] Update iptool and change sdk names --- .github/workflows/hi3516ev200_images.yml | 2 +- .github/workflows/hi3516ev300_images.yml | 2 +- .github/workflows/hi3518ev300_images.yml | 2 +- .github/workflows/xm530_images.yml | 2 +- br-ext-chip-hisilicon/package/ipctool/ipctool.mk | 2 +- br-ext-chip-xiongmai/package/ipctool/ipctool.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/hi3516ev200_images.yml b/.github/workflows/hi3516ev200_images.yml index 9b4d850b..d5c06cea 100644 --- a/.github/workflows/hi3516ev200_images.yml +++ b/.github/workflows/hi3516ev200_images.yml @@ -114,7 +114,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ env.ARCHIVE_SDK }} - asset_name: "arm-openipc-linux-musleabi_sdk-buildroot.tar.gz" + asset_name: "arm-openipc-hi3516ev200-linux-musleabi_sdk-buildroot.tar.gz" tag: ${{ env.TAG_NAME }} overwrite: true diff --git a/.github/workflows/hi3516ev300_images.yml b/.github/workflows/hi3516ev300_images.yml index 94a42c88..bcdeae80 100644 --- a/.github/workflows/hi3516ev300_images.yml +++ b/.github/workflows/hi3516ev300_images.yml @@ -114,7 +114,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ env.ARCHIVE_SDK }} - asset_name: "arm-openipc-linux-musleabi_sdk-buildroot.tar.gz" + asset_name: "arm-openipc-hi3516ev300-linux-musleabi_sdk-buildroot.tar.gz" tag: ${{ env.TAG_NAME }} overwrite: true diff --git a/.github/workflows/hi3518ev300_images.yml b/.github/workflows/hi3518ev300_images.yml index f7c8ccf1..26ef7be6 100644 --- a/.github/workflows/hi3518ev300_images.yml +++ b/.github/workflows/hi3518ev300_images.yml @@ -114,7 +114,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ env.ARCHIVE_SDK }} - asset_name: "arm-openipc-linux-musleabi_sdk-buildroot.tar.gz" + asset_name: "arm-openipc-hi3518ev300-linux-musleabi_sdk-buildroot.tar.gz" tag: ${{ env.TAG_NAME }} overwrite: true diff --git a/.github/workflows/xm530_images.yml b/.github/workflows/xm530_images.yml index 134af4c8..86ef2209 100644 --- a/.github/workflows/xm530_images.yml +++ b/.github/workflows/xm530_images.yml @@ -3,7 +3,7 @@ name: OpenIPC for XM530 on: push: branches: - - dev + - master tags: - "v*" diff --git a/br-ext-chip-hisilicon/package/ipctool/ipctool.mk b/br-ext-chip-hisilicon/package/ipctool/ipctool.mk index 3d6c6eb0..06fff403 100644 --- a/br-ext-chip-hisilicon/package/ipctool/ipctool.mk +++ b/br-ext-chip-hisilicon/package/ipctool/ipctool.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCTOOL_VERSION = 04b2eec1f6d2cbb053548257836e6a7bbebf9d93 +IPCTOOL_VERSION = 7e523a84b054a122245039b7b32e67bf0995ba8f IPCTOOL_SITE = $(call github,openipc,ipctool,$(IPCTOOL_VERSION)) IPCTOOL_LICENSE = MIT IPCTOOL_LICENSE_FILES = LICENSE diff --git a/br-ext-chip-xiongmai/package/ipctool/ipctool.mk b/br-ext-chip-xiongmai/package/ipctool/ipctool.mk index 3d6c6eb0..06fff403 100644 --- a/br-ext-chip-xiongmai/package/ipctool/ipctool.mk +++ b/br-ext-chip-xiongmai/package/ipctool/ipctool.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCTOOL_VERSION = 04b2eec1f6d2cbb053548257836e6a7bbebf9d93 +IPCTOOL_VERSION = 7e523a84b054a122245039b7b32e67bf0995ba8f IPCTOOL_SITE = $(call github,openipc,ipctool,$(IPCTOOL_VERSION)) IPCTOOL_LICENSE = MIT IPCTOOL_LICENSE_FILES = LICENSE From 673469ca11c440d9a1222e535109c6ca791b4585 Mon Sep 17 00:00:00 2001 From: Igor Zalatov Date: Sun, 18 Apr 2021 21:11:01 +0300 Subject: [PATCH 3/4] Fix path xm530 --- .github/workflows/xm530_images.yml | 2 +- ...nknown_defconfig => unknown_unknown_xm530_openipc_defconfig} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename br-ext-chip-xiongmai/configs/{unknown_unknown_xm530_unknown_defconfig => unknown_unknown_xm530_openipc_defconfig} (100%) diff --git a/.github/workflows/xm530_images.yml b/.github/workflows/xm530_images.yml index 86ef2209..134af4c8 100644 --- a/.github/workflows/xm530_images.yml +++ b/.github/workflows/xm530_images.yml @@ -3,7 +3,7 @@ name: OpenIPC for XM530 on: push: branches: - - master + - dev tags: - "v*" diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_unknown_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig similarity index 100% rename from br-ext-chip-xiongmai/configs/unknown_unknown_xm530_unknown_defconfig rename to br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig From d934bbdeaa6913fdce51be1c5c12cacd499ad47b Mon Sep 17 00:00:00 2001 From: Igor Zalatov Date: Sun, 18 Apr 2021 21:23:59 +0300 Subject: [PATCH 4/4] Update --- .github/workflows/xm530_images.yml | 2 +- Makefile | 4 ++-- general/overlay/usr/lib/libjson-c.so.2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/xm530_images.yml b/.github/workflows/xm530_images.yml index 134af4c8..30210ebe 100644 --- a/.github/workflows/xm530_images.yml +++ b/.github/workflows/xm530_images.yml @@ -3,7 +3,7 @@ name: OpenIPC for XM530 on: push: branches: - - dev + - xm530 tags: - "v*" diff --git a/Makefile b/Makefile index ff928c77..c093b2bd 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ ROOT_DIR := $(CURDIR) BR_VER := 2020.02 BR_DIR := $(ROOT_DIR)/buildroot-$(BR_VER) -#BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-hisilicon -BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-xiongmai +BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-hisilicon +#BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-xiongmai SCRIPTS_DIR := $(ROOT_DIR)/scripts BOARDS := $(shell ls -1 $(BR_EXT_DIR)/configs) diff --git a/general/overlay/usr/lib/libjson-c.so.2 b/general/overlay/usr/lib/libjson-c.so.2 index c8352060..92f56419 120000 --- a/general/overlay/usr/lib/libjson-c.so.2 +++ b/general/overlay/usr/lib/libjson-c.so.2 @@ -1 +1 @@ -/usr/lib/libjson-c.so.5 \ No newline at end of file +/usr/lib/libjson-c.so.4 \ No newline at end of file