From 63d95204d12cb23bcf45a5c564a435465db76437 Mon Sep 17 00:00:00 2001 From: "J. German Rivera" Date: Mon, 15 Apr 2024 22:39:15 -0400 Subject: [PATCH 1/5] hirtos 2.0.0 (via `alr publish --submit`) --- index/hi/hirtos/hirtos-2.0.0.toml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 index/hi/hirtos/hirtos-2.0.0.toml diff --git a/index/hi/hirtos/hirtos-2.0.0.toml b/index/hi/hirtos/hirtos-2.0.0.toml new file mode 100644 index 000000000..25d2aee0e --- /dev/null +++ b/index/hi/hirtos/hirtos-2.0.0.toml @@ -0,0 +1,31 @@ +# +# NOTE: Before building for the first time with `alr build`, select the +# corresponding cross compiler toolchain by running `alr toolchain --select` +# +name = "hirtos" +description = "High-Integrity RTOS" +version = "2.0.0" +licenses = "Apache-2.0" +website = "https://github.com/jgrivera67/HiRTOS" +tags = ["rtos"] +authors = ["J. German Rivera"] +maintainers = ["J. German Rivera "] +maintainers-logins = ["jgrivera67"] + +[configuration.variables] +Platform = {type = "Enum", values = ["arm_fvp", "esp32_c3"], default = "arm_fvp"} + +[[depends-on]] +gnat_arm_elf = "^13.2.1" +#gnat_riscv64_elf = "^13.2.1" +gnatprove = "^13.2.1" + +[gpr-set-externals] +CPU_Core = "arm_cortex_r52" +#CPU_Core = "riscv32" + + +[origin] +commit = "63f7fdd2a01e061990a8921c64bb7966fad35e40" +url = "git+https://github.com/jgrivera67/HiRTOS.git" + From d9dbbbfc5e426778b62f33dbd93007155d99e0a6 Mon Sep 17 00:00:00 2001 From: "J. German Rivera" Date: Sat, 20 Apr 2024 10:59:58 -0400 Subject: [PATCH 2/5] Addressed PR review comments Signed-off-by: J. German Rivera --- index/hi/hirtos/hirtos-2.0.0.toml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/index/hi/hirtos/hirtos-2.0.0.toml b/index/hi/hirtos/hirtos-2.0.0.toml index 25d2aee0e..0977b75cf 100644 --- a/index/hi/hirtos/hirtos-2.0.0.toml +++ b/index/hi/hirtos/hirtos-2.0.0.toml @@ -1,6 +1,11 @@ # -# NOTE: Before building for the first time with `alr build`, select the -# corresponding cross compiler toolchain by running `alr toolchain --select` +# Copyright (c) 2022-2024, German Rivera +# +# SPDX-License-Identifier: Apache-2.0 +# +# NOTE: This crate is not meant to be built with the native compiler. +# A dependency on a cross-compiler must be specified in the client +# crate. See example client crates in the sample_apps folder. # name = "hirtos" description = "High-Integrity RTOS" @@ -15,17 +20,17 @@ maintainers-logins = ["jgrivera67"] [configuration.variables] Platform = {type = "Enum", values = ["arm_fvp", "esp32_c3"], default = "arm_fvp"} -[[depends-on]] -gnat_arm_elf = "^13.2.1" -#gnat_riscv64_elf = "^13.2.1" -gnatprove = "^13.2.1" - -[gpr-set-externals] -CPU_Core = "arm_cortex_r52" -#CPU_Core = "riscv32" +[[actions]] +type = "test" +command = ["alr", "build"] +directory = "sample_apps/fvp_armv8r_aarch32_hello" +[[actions]] +type = "test" +command = ["alr", "build"] +directory = "sample_apps/esp32_c3_hello" [origin] -commit = "63f7fdd2a01e061990a8921c64bb7966fad35e40" +commit = "0c01280da07399a8a7fa8cb7980c3b7c3713801d" url = "git+https://github.com/jgrivera67/HiRTOS.git" From f4b092384561322e6d5554c5b43bf44205e855f2 Mon Sep 17 00:00:00 2001 From: "J. German Rivera" Date: Fri, 17 May 2024 10:30:14 -0400 Subject: [PATCH 3/5] Fixed post-build errors to pass CI Signed-off-by: J. German Rivera --- index/hi/hirtos/hirtos-2.0.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/hi/hirtos/hirtos-2.0.0.toml b/index/hi/hirtos/hirtos-2.0.0.toml index 0977b75cf..e38c79f4d 100644 --- a/index/hi/hirtos/hirtos-2.0.0.toml +++ b/index/hi/hirtos/hirtos-2.0.0.toml @@ -31,6 +31,6 @@ command = ["alr", "build"] directory = "sample_apps/esp32_c3_hello" [origin] -commit = "0c01280da07399a8a7fa8cb7980c3b7c3713801d" +commit = "b091813c4123af30d6601ed70aea2b0dbbae55e5" url = "git+https://github.com/jgrivera67/HiRTOS.git" From a16fc3a8aad5662be375c63044d4c680c04f6b2f Mon Sep 17 00:00:00 2001 From: "J. German Rivera" Date: Tue, 21 May 2024 09:49:47 -0400 Subject: [PATCH 4/5] Skip unsupported build steps when building on Windows Signed-off-by: J. German Rivera --- index/hi/hirtos/hirtos-2.0.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/hi/hirtos/hirtos-2.0.0.toml b/index/hi/hirtos/hirtos-2.0.0.toml index e38c79f4d..b8f268145 100644 --- a/index/hi/hirtos/hirtos-2.0.0.toml +++ b/index/hi/hirtos/hirtos-2.0.0.toml @@ -31,6 +31,6 @@ command = ["alr", "build"] directory = "sample_apps/esp32_c3_hello" [origin] -commit = "b091813c4123af30d6601ed70aea2b0dbbae55e5" +commit = "ebcd8cb20115356aa0d99c97124e47a175e56e8e" url = "git+https://github.com/jgrivera67/HiRTOS.git" From 69e7ddecdb675a4bc0aef3f6d892d6e34fed4507 Mon Sep 17 00:00:00 2001 From: "J. German Rivera" Date: Tue, 21 May 2024 11:46:19 -0400 Subject: [PATCH 5/5] Added gprbuild 22 dependency for test crates for CI Signed-off-by: J. German Rivera --- index/hi/hirtos/hirtos-2.0.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index/hi/hirtos/hirtos-2.0.0.toml b/index/hi/hirtos/hirtos-2.0.0.toml index b8f268145..ea5a452a8 100644 --- a/index/hi/hirtos/hirtos-2.0.0.toml +++ b/index/hi/hirtos/hirtos-2.0.0.toml @@ -31,6 +31,6 @@ command = ["alr", "build"] directory = "sample_apps/esp32_c3_hello" [origin] -commit = "ebcd8cb20115356aa0d99c97124e47a175e56e8e" +commit = "66847740b093b19386959b0e7b65b0a09172a082" url = "git+https://github.com/jgrivera67/HiRTOS.git"