From da7d2f7d54de76b2575c3194d75fc8c087083b12 Mon Sep 17 00:00:00 2001 From: Damian Date: Fri, 6 Oct 2023 16:54:54 +0200 Subject: [PATCH] update submodules * phoenix-rtos-tests 345b9f7...ba60f4a (1): > psh: avoid SH syntax in test strings --- .github/actions/phoenix-build/action.yml | 2 +- _targets/build.project.armv7a7-imx6ull | 1 + _targets/build.project.armv7a9-zynq7000 | 1 + _targets/build.project.armv7m4-stm32l4x6 | 1 + _targets/build.project.armv7m7-imxrt105x | 1 + _targets/build.project.armv7m7-imxrt106x | 1 + _targets/build.project.armv7m7-imxrt117x | 1 + _targets/build.project.ia32-generic | 1 + _targets/build.project.riscv64-generic | 1 + phoenix-rtos-filesystems | 2 +- phoenix-rtos-ports | 2 +- phoenix-rtos-tests | 2 +- plo | 2 +- 13 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/actions/phoenix-build/action.yml b/.github/actions/phoenix-build/action.yml index 696ad6fe7..e66578927 100644 --- a/.github/actions/phoenix-build/action.yml +++ b/.github/actions/phoenix-build/action.yml @@ -42,7 +42,7 @@ runs: CI_CUSTOM_BUILDROOT: ${{ inputs.buildroot }} LONG_TEST: ${{ inputs.nightly == 'true' && 'y' || 'n' }} args: - - ${{ inputs.params }} # note: params will be split by build.sh internally + - ${{ inputs.params }} ports # note: params will be split by build.sh internally # branding branding: diff --git a/_targets/build.project.armv7a7-imx6ull b/_targets/build.project.armv7a7-imx6ull index 981f03a4e..0fdbe6cba 100644 --- a/_targets/build.project.armv7a7-imx6ull +++ b/_targets/build.project.armv7a7-imx6ull @@ -28,6 +28,7 @@ export PORTS_LZO=y export PORTS_OPENVPN=y export PORTS_JANSSON=y export PORTS_CURL=y +export PORTS_FS_MARK=y # # Platform dependent parameters diff --git a/_targets/build.project.armv7a9-zynq7000 b/_targets/build.project.armv7a9-zynq7000 index 8be255c40..be008025a 100644 --- a/_targets/build.project.armv7a9-zynq7000 +++ b/_targets/build.project.armv7a9-zynq7000 @@ -14,6 +14,7 @@ CROSS=arm-phoenix- export PSH_DEFUSRPWDHASH="0B1ANiYi45IhxkfmUW155/GBd4IRE=" export PORTS_BUSYBOX=y +export PORTS_FS_MARK=y # # Default platform dependent parameters diff --git a/_targets/build.project.armv7m4-stm32l4x6 b/_targets/build.project.armv7m4-stm32l4x6 index f734ae47d..d01214b04 100644 --- a/_targets/build.project.armv7m4-stm32l4x6 +++ b/_targets/build.project.armv7m4-stm32l4x6 @@ -28,6 +28,7 @@ export PORTS_LZO=n export PORTS_OPENVPN=n export PORTS_JANSSON=n export PORTS_CURL=n +export PORTS_FS_MARK=y # diff --git a/_targets/build.project.armv7m7-imxrt105x b/_targets/build.project.armv7m7-imxrt105x index d93506f53..851ddef5a 100644 --- a/_targets/build.project.armv7m7-imxrt105x +++ b/_targets/build.project.armv7m7-imxrt105x @@ -31,6 +31,7 @@ export PORTS_CURL=n export PORTS_MICROPYTHON=n export PORTS_MBEDTLS=n export PORTS_AZURE_SDK=n +export PORTS_FS_MARK=y # diff --git a/_targets/build.project.armv7m7-imxrt106x b/_targets/build.project.armv7m7-imxrt106x index 70b4effaa..471cafc4c 100644 --- a/_targets/build.project.armv7m7-imxrt106x +++ b/_targets/build.project.armv7m7-imxrt106x @@ -31,6 +31,7 @@ export PORTS_CURL=n export PORTS_MICROPYTHON=n export PORTS_MBEDTLS=n export PORTS_AZURE_SDK=n +export PORTS_FS_MARK=y # diff --git a/_targets/build.project.armv7m7-imxrt117x b/_targets/build.project.armv7m7-imxrt117x index bf644a65b..f27a0a050 100644 --- a/_targets/build.project.armv7m7-imxrt117x +++ b/_targets/build.project.armv7m7-imxrt117x @@ -28,6 +28,7 @@ export PORTS_LZO=n export PORTS_OPENVPN=n export PORTS_JANSSON=n export PORTS_CURL=n +export PORTS_FS_MARK=y diff --git a/_targets/build.project.ia32-generic b/_targets/build.project.ia32-generic index 6584954ae..28225e3a7 100644 --- a/_targets/build.project.ia32-generic +++ b/_targets/build.project.ia32-generic @@ -33,6 +33,7 @@ export PORTS_OPENVPN=y export PORTS_JANSSON=y export PORTS_CURL=y export PORTS_MICROPYTHON=y +export PORTS_FS_MARK=y # # Platform dependent parameters diff --git a/_targets/build.project.riscv64-generic b/_targets/build.project.riscv64-generic index b97cf10ef..0a91a46d9 100644 --- a/_targets/build.project.riscv64-generic +++ b/_targets/build.project.riscv64-generic @@ -30,6 +30,7 @@ export PORTS_LZO=y export PORTS_OPENVPN=y export PORTS_JANSSON=y export PORTS_CURL=y +export PORTS_FS_MARK=y # diff --git a/phoenix-rtos-filesystems b/phoenix-rtos-filesystems index c4fd8dedd..1b2c42b27 160000 --- a/phoenix-rtos-filesystems +++ b/phoenix-rtos-filesystems @@ -1 +1 @@ -Subproject commit c4fd8dedd0a274e515da74a57887d85bb449ec8f +Subproject commit 1b2c42b27f47e099574f626a742a01595b2ec7c2 diff --git a/phoenix-rtos-ports b/phoenix-rtos-ports index 9feddd4d1..9ca9a4a01 160000 --- a/phoenix-rtos-ports +++ b/phoenix-rtos-ports @@ -1 +1 @@ -Subproject commit 9feddd4d11c57977c9af0abb85c73e5c3f9134c7 +Subproject commit 9ca9a4a0129cbe9a6b1dcc0b424c8e3bdec79b03 diff --git a/phoenix-rtos-tests b/phoenix-rtos-tests index a37c9150e..9b3ff9dd7 160000 --- a/phoenix-rtos-tests +++ b/phoenix-rtos-tests @@ -1 +1 @@ -Subproject commit a37c9150ee5d031ba8b038832b5acec9719b3b56 +Subproject commit 9b3ff9dd71515706c111228f4474607eed76539f diff --git a/plo b/plo index 7c6204243..68cb3fc9f 160000 --- a/plo +++ b/plo @@ -1 +1 @@ -Subproject commit 7c6204243e0713ff1fb2cce0bc473491a529e427 +Subproject commit 68cb3fc9f8229e37fd932bd9b8928c60a274931e