From 214c1045e2e8b85c211daf979db94ad28126a120 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Mon, 9 Aug 2021 13:00:04 +0300 Subject: [PATCH] Fix xm530 building --- .github/workflows/xm530_images.yml | 5 +++++ .../configs/unknown_unknown_xm510_openipc_defconfig | 1 + .../configs/unknown_unknown_xm530_openipc_defconfig | 1 + br-ext-chip-xiongmai/external.mk | 4 ++-- .../majestic-xm510/{majestic.mk => majestic-xm510.mk} | 0 .../majestic-xm530/{majestic.mk => majestic-xm530.mk} | 0 6 files changed, 9 insertions(+), 2 deletions(-) rename br-ext-chip-xiongmai/package/majestic-xm510/{majestic.mk => majestic-xm510.mk} (100%) rename br-ext-chip-xiongmai/package/majestic-xm530/{majestic.mk => majestic-xm530.mk} (100%) diff --git a/.github/workflows/xm530_images.yml b/.github/workflows/xm530_images.yml index 3e29ab61..e63c5488 100644 --- a/.github/workflows/xm530_images.yml +++ b/.github/workflows/xm530_images.yml @@ -1,6 +1,11 @@ name: OpenIPC for XM530 on: + push: + branches: + - master + tags: + - "v*" workflow_dispatch: jobs: diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig index 83ebf458..0f996314 100644 --- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig +++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig @@ -53,6 +53,7 @@ BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBYAML=y # BR2_PACKAGE_MAJESTIC_XM510 is not set +# BR2_PACKAGE_MAJESTIC_XM530 is not set # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_VTUND_OPENIPC=y # BR2_PACKAGE_XIONGMAI_OSDRV_XM510 is not set diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig index 47c2df77..dc080e5f 100644 --- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig +++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig @@ -52,6 +52,7 @@ BR2_PACKAGE_JSON_C=y BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBYAML=y +# BR2_PACKAGE_MAJESTIC_XM510 is not set # BR2_PACKAGE_MAJESTIC_XM530 is not set # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_VTUND_OPENIPC=y diff --git a/br-ext-chip-xiongmai/external.mk b/br-ext-chip-xiongmai/external.mk index c28ef07e..50cc0ac1 100644 --- a/br-ext-chip-xiongmai/external.mk +++ b/br-ext-chip-xiongmai/external.mk @@ -14,8 +14,8 @@ include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/majestic-xm530/majestic-xm530.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/node-exporter/node-exporter.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/opus-openipc/opus-openipc.mk -include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/uacme-lite/uacme-openipc.mk -include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/vtund-lite/vtund-openipc.mk +include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/uacme-openipc/uacme-openipc.mk +include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/vtund-openipc/vtund-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file diff --git a/br-ext-chip-xiongmai/package/majestic-xm510/majestic.mk b/br-ext-chip-xiongmai/package/majestic-xm510/majestic-xm510.mk similarity index 100% rename from br-ext-chip-xiongmai/package/majestic-xm510/majestic.mk rename to br-ext-chip-xiongmai/package/majestic-xm510/majestic-xm510.mk diff --git a/br-ext-chip-xiongmai/package/majestic-xm530/majestic.mk b/br-ext-chip-xiongmai/package/majestic-xm530/majestic-xm530.mk similarity index 100% rename from br-ext-chip-xiongmai/package/majestic-xm530/majestic.mk rename to br-ext-chip-xiongmai/package/majestic-xm530/majestic-xm530.mk