From 2b037e692b85aad13f96edb8a3709378e1081ccd Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 2 Oct 2018 07:57:50 +0200 Subject: [PATCH 01/11] Update RTEMS baseline --- build/build-libbsd.sh | 3 +- build/libbsd-buildset.ini | 11 +++++ grisp-sd-sample/Makefile | 2 +- libgrisp/src/init.c | 90 ++++++++++----------------------------- rtems | 2 +- rtems-libbsd | 2 +- rtems-source-builder | 2 +- 7 files changed, 40 insertions(+), 72 deletions(-) create mode 100644 build/libbsd-buildset.ini diff --git a/build/build-libbsd.sh b/build/build-libbsd.sh index 9e1d5a9..61bc009 100755 --- a/build/build-libbsd.sh +++ b/build/build-libbsd.sh @@ -57,7 +57,8 @@ fi waf configure \ --prefix="${PREFIX}" \ - --rtems-bsps="${RTEMS_CPU}/${BSP_NAME}" + --rtems-bsps="${RTEMS_CPU}/${BSP_NAME}" \ + --buildset="${SCRIPTDIR}/libbsd-buildset.ini" waf if [ $DO_INSTALL -ne 0 ] diff --git a/build/libbsd-buildset.ini b/build/libbsd-buildset.ini new file mode 100644 index 0000000..976028e --- /dev/null +++ b/build/libbsd-buildset.ini @@ -0,0 +1,11 @@ +[general] +name = grisp +extends = default.ini + +[modules] +# WiFi +dev_usb_wlan = on +dev_wlan_rtwn = on +net80211 = on +user_space_wlanstats = on +usr_sbin_wpa_supplicant = on diff --git a/grisp-sd-sample/Makefile b/grisp-sd-sample/Makefile index 6cba19e..b095f26 100644 --- a/grisp-sd-sample/Makefile +++ b/grisp-sd-sample/Makefile @@ -17,7 +17,7 @@ $(BUILDDIR): mkdir $(BUILDDIR) $(APP).exe: $(APP_OBJS) - $(CCLINK) $^ -lgrisp -lbsd -lm -o $@ + $(CCLINK) $^ -lgrisp -lftpd -lbsd -lm -o $@ $(APP).bin: $(APP).exe $(OBJCOPY) -O binary $^ $@ diff --git a/libgrisp/src/init.c b/libgrisp/src/init.c index 8016835..4028fb1 100644 --- a/libgrisp/src/init.c +++ b/libgrisp/src/init.c @@ -37,12 +37,11 @@ #include #include -#include - #include #include #include #include +#include #include #include #include @@ -149,74 +148,29 @@ grisp_init_sd_card(void) assert(sc == RTEMS_SUCCESSFUL); } -static void -grisp_init_network_ifconfig_lo0(void) -{ - int exit_code; - char *lo0[] = { - "ifconfig", - "lo0", - "inet", - "127.0.0.1", - "netmask", - "255.255.255.0", - NULL - }; - char *lo0_inet6[] = { - "ifconfig", - "lo0", - "inet6", - "::1", - "prefixlen", - "128", - "alias", - NULL - }; - - exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0), lo0); - assert(exit_code == EX_OK); - - exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0_inet6), lo0_inet6); - assert(exit_code == EX_OK); -} - -static void -network_dhcpcd_task(rtems_task_argument arg) -{ - int exit_code; - const char *cconf = (const char*) arg; - char* conf = NULL; - if (cconf && (access(cconf, F_OK | R_OK ) != -1) && (conf = strdup(cconf))) { - char *dhcpcd[] = {"dhcpcd", "-f", conf, NULL}; - exit_code = rtems_bsd_command_dhcpcd(RTEMS_BSD_ARGC(dhcpcd), dhcpcd); - free(conf); - } else { - char *dhcpcd[] = {"dhcpcd", NULL}; - exit_code = rtems_bsd_command_dhcpcd(RTEMS_BSD_ARGC(dhcpcd), dhcpcd); - } - - assert(exit_code == EXIT_SUCCESS); - - rtems_task_delete(RTEMS_SELF); -} - void -grisp_init_dhcpcd_with_config(rtems_task_priority prio, const char *conf) +grisp_init_dhcpcd_with_config(rtems_task_priority prio, const char *cfile) { + rtems_dhcpcd_config config; rtems_status_code sc; - rtems_id id; - - sc = rtems_task_create( - rtems_build_name('D', 'H', 'C', 'P'), - prio, - 2 * RTEMS_MINIMUM_STACK_SIZE, - RTEMS_DEFAULT_MODES, - RTEMS_FLOATING_POINT, - &id - ); - assert(sc == RTEMS_SUCCESSFUL); + int argc = 1; + char *argv[] = {"dhcpcd", NULL, NULL, NULL}; + char *file = NULL; + + if (cfile != NULL && access(cfile, F_OK | R_OK ) == 0 && + (file = strdup(cfile))) { + argc = 3; + argv[1] = "-f"; + argv[2] = file; + } + + memset(&config, 0, sizeof(config)); + config.priority = prio; + config.argc = argc; + config.argv = argv; - sc = rtems_task_start(id, network_dhcpcd_task, (rtems_task_argument) conf); + sc = rtems_dhcpcd_start(&config); + free(file); assert(sc == RTEMS_SUCCESSFUL); } @@ -230,13 +184,15 @@ void grisp_init_libbsd(void) { rtems_status_code sc; + int exit_code; grisp_saf1761_basic_init(); sc = rtems_bsd_initialize(); assert(sc == RTEMS_SUCCESSFUL); - grisp_init_network_ifconfig_lo0(); + exit_code = rtems_bsd_ifconfig_lo0(); + assert(exit_code == EX_OK); grisp_wlan_power_up(); /* Let the callout timer allocate its resources */ diff --git a/rtems b/rtems index 8b5a801..b131cb2 160000 --- a/rtems +++ b/rtems @@ -1 +1 @@ -Subproject commit 8b5a801e85e273aa9778bbf5b41269ae15fceb30 +Subproject commit b131cb2aa035e6176e6ef362f09e39778f9063cb diff --git a/rtems-libbsd b/rtems-libbsd index ef5d536..1e77a45 160000 --- a/rtems-libbsd +++ b/rtems-libbsd @@ -1 +1 @@ -Subproject commit ef5d536f840e01cb7a9edfd9f72dd0f058fb62aa +Subproject commit 1e77a45d54bfc52eb76453f3e1327645acc8f77b diff --git a/rtems-source-builder b/rtems-source-builder index 8ee4e8c..d2d4678 160000 --- a/rtems-source-builder +++ b/rtems-source-builder @@ -1 +1 @@ -Subproject commit 8ee4e8cd557c25fca59bb9751751ad4172530958 +Subproject commit d2d46786f113ed39d29deafa3feeb4d42ae94001 From 42b1a945155498567325215f27bc473a7bc5f126 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 4 Oct 2018 14:41:30 +0200 Subject: [PATCH 02/11] libgrisp: Fix warning --- libgrisp/src/init_wpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libgrisp/src/init_wpa.c b/libgrisp/src/init_wpa.c index 4991c8e..f0b9483 100644 --- a/libgrisp/src/init_wpa.c +++ b/libgrisp/src/init_wpa.c @@ -31,6 +31,7 @@ #include #include +#include #include #include From 9677d3bf946453c84507635c8020f0e4d51e2da7 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 4 Oct 2018 14:41:50 +0200 Subject: [PATCH 03/11] libgrisp: Use same priority for all libbsd tasks This reduces the amount of task switches in libbsd and thus improves throughput. --- libgrisp/src/init.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libgrisp/src/init.c b/libgrisp/src/init.c index 4028fb1..ada6d33 100644 --- a/libgrisp/src/init.c +++ b/libgrisp/src/init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 embedded brains GmbH. All rights reserved. + * Copyright (c) 2016, 2018 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Dornierstr. 4 @@ -319,3 +319,11 @@ grisp_wlan_power_down(void) const Pin wlan_en = GRISP_WLAN_EN; PIO_Set(&wlan_en); } + +rtems_task_priority +rtems_bsd_get_task_priority(const char *name) +{ + + (void)name; + return (100); +} From 8b2967b7567dfc10db2a48f68e385472b67d9cd3 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 4 Oct 2018 14:43:08 +0200 Subject: [PATCH 04/11] libgrisp: Reduce stack size of libbsd tasks Enable a custom stack allocator which uses the internal SRAM for the task stacks if available. --- grisp-sd-sample/init.c | 7 ++++--- libgrisp/src/init.c | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/grisp-sd-sample/init.c b/grisp-sd-sample/init.c index 8c0ecb3..fcec756 100644 --- a/grisp-sd-sample/init.c +++ b/grisp-sd-sample/init.c @@ -47,13 +47,14 @@ #include #include +#include #include #include #include -#define STACK_SIZE_INIT_TASK (64 * 1024) -#define STACK_SIZE_SHELL (64 * 1024) +#define STACK_SIZE_INIT_TASK (16 * 1024) +#define STACK_SIZE_SHELL (16 * 1024) #define PRIO_SHELL 150 #define PRIO_LED_TASK (RTEMS_MAXIMUM_PRIORITY - 1) @@ -186,9 +187,9 @@ Init(rtems_task_argument arg) grisp_led_set1(false, false, false); grisp_led_set2(true, false, false); puts("\nGRISP RTEMS SD Demo\n"); - grisp_init_sd_card(); grisp_init_lower_self_prio(); grisp_init_libbsd(); + grisp_init_sd_card(); /* Wait for the SD card */ grisp_led_set2(true, false, true); diff --git a/libgrisp/src/init.c b/libgrisp/src/init.c index ada6d33..9510e12 100644 --- a/libgrisp/src/init.c +++ b/libgrisp/src/init.c @@ -327,3 +327,11 @@ rtems_bsd_get_task_priority(const char *name) (void)name; return (100); } + +size_t +rtems_bsd_get_task_stack_size(const char *name) +{ + + (void)name; + return 8 * 1024; +} From a56f8f558977b93186624f0763378c67c3c37c2f Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Sat, 2 Feb 2019 16:42:17 +0100 Subject: [PATCH 05/11] Add CircleCI config --- .circleci/config.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..a9d2367 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,48 @@ +version: 2.1 +jobs: + build: + docker: + - image: 'opensuse:leap' + steps: + - run: 'zypper install -y --type pattern devel_basis devel_C_C++' + - run: 'zypper install -y git python3-devel python-devel gcc-c++ unzip' + - run: + name: Set path variable + command: | + SHORT_SHA1=$(echo "${CIRCLE_SHA1}" | cut -c 1-10) + echo 'export TOOLCHAIN_PATH="/opt/grisp/grisp-software/grisp-base/'$SHORT_SHA1'"' >> $BASH_ENV + - run: mkdir -p ${TOOLCHAIN_PATH} + - checkout + - run: shopt -s dotglob && mv ./* "${TOOLCHAIN_PATH}" + - run: 'git -C "${TOOLCHAIN_PATH}" submodule update --init rtems-source-builder' + - run: + name: Disable parallelism during gcc build due to RAM limit at CircleCI + command: 'sed -i "s/%define with_threads 1/%define with_threads 0/" ${TOOLCHAIN_PATH}/rtems-source-builder/rtems/config/tools/rtems-gcc-7.3.0-newlib-3.0.0.cfg' + - run: + command: cd $TOOLCHAIN_PATH; ./build/build.sh + no_output_timeout: 90m + - persist_to_workspace: + root: /opt + paths: + - grisp/*/*/*/rtems-install + deploy: + docker: + - image: 'opensuse:leap' + steps: + - run: 'zypper install -y aws-cli tar gzip' + - attach_workspace: + at: /opt + - run: + command: "GRISP_TOOLCHAIN_REVISION=$(cat /opt/grisp/*/*/*/rtems-install/rtems/5/GRISP_TOOLCHAIN_REVISION) && + tar -czf /tmp/grisp_toolchain_arm-rtems5_Linux_$GRISP_TOOLCHAIN_REVISION.tar.gz ." + working_directory: /opt + - deploy: + command: aws s3 cp /tmp/grisp_toolchain_*.tar.gz s3://grisp/platforms/grisp_base/toolchain/ --acl public-read +workflows: + version: 2 + build-deploy: + jobs: + - build + - deploy: + requires: + - build From bed8dd7f74915ddd2a917435602f455758a5cf9c Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Tue, 19 Feb 2019 13:02:53 +0100 Subject: [PATCH 06/11] Add status badge --- README.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index 043a193..17eb5aa 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,7 +1,9 @@ GRISP ===== -:toc: +image:https://circleci.com/gh/grisp/grisp-software/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/grisp/grisp-software/tree/master"] + +:toc: == Prerequisites - the +xz+ decompression tool needs to be installed From 81dd5fdab4a931631d941912e1a0415617db0e1d Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Mon, 11 Mar 2019 16:48:54 +0100 Subject: [PATCH 07/11] Store rsb-report artifact when build fails --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a9d2367..3f12791 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,13 @@ jobs: - run: command: cd $TOOLCHAIN_PATH; ./build/build.sh no_output_timeout: 90m + - run: + command: | + mkdir -p /tmp/rsb-reports + cp $TOOLCHAIN_PATH/rtems-source-builder/rtems/rsb-report* /tmp/rsb-reports + when: on_fail + - store_artifacts: + path: /tmp/rsb-reports - persist_to_workspace: root: /opt paths: From 7f51e9ec30cdc495cedb3cabd1c4aedba3c37231 Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Tue, 12 Mar 2019 10:15:49 +0100 Subject: [PATCH 08/11] Add dmesg output to CI artifacts --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f12791..4e75a0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,7 @@ jobs: command: | mkdir -p /tmp/rsb-reports cp $TOOLCHAIN_PATH/rtems-source-builder/rtems/rsb-report* /tmp/rsb-reports + dmesg > /tmp/rsb-reports/dmesg_output.txt when: on_fail - store_artifacts: path: /tmp/rsb-reports From cd73e8f90dea5bdd72060cb67e55ce9bf645ecad Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Tue, 12 Mar 2019 13:15:24 +0100 Subject: [PATCH 09/11] Test OTP build with new toolchain --- .circleci/config.yml | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e75a0b..e6000b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,8 @@ version: 2.1 +orbs: + grisp: grisp/grisp@0.0.2 jobs: - build: + build-toolchain: docker: - image: 'opensuse:leap' steps: @@ -33,7 +35,24 @@ jobs: root: /opt paths: - grisp/*/*/*/rtems-install - deploy: + build-otp: + docker: + - image: 'opensuse:leap' + steps: + - grisp/install-erlang + - grisp/install-rebar3 + - attach_workspace: + at: /opt + - grisp/create-grisp-project: + build-otp: true + deploy-destination: '/tmp/deploy' + - run: + command: source ~/.bashrc && rebar3 grisp build + working_directory: /root/ciproject + - run: + command: source ~/.bashrc && rebar3 grisp deploy -v 0.1.0 -n ciproject + working_directory: /root/ciproject + deploy-toolchain: docker: - image: 'opensuse:leap' steps: @@ -50,7 +69,11 @@ workflows: version: 2 build-deploy: jobs: - - build - - deploy: + - build-toolchain + - build-otp: + requires: + - build-toolchain + - deploy-toolchain: requires: - - build + - build-toolchain + - build-otp From c6e756dc2147c9a1379b3092ed4d98758ebb4a17 Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Tue, 26 Mar 2019 10:55:32 +0100 Subject: [PATCH 10/11] Update to fix building on macOS 10.14 Note: Python 3 is now needed to build libbsd (because of the bug https://devel.rtems.org/ticket/3709). --- .gitmodules | 8 ++++---- build/build-libbsd.sh | 8 +++++--- rtems | 2 +- rtems-libbsd | 2 +- rtems-source-builder | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3e6f1b9..7f854c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "rtems"] path = rtems - url = https://github.com/grisp/rtems - branch = grisp-20171025-patches + url = git://git.rtems.org/rtems.git + branch = master [submodule "rtems-libbsd"] path = rtems-libbsd - url = https://github.com/grisp/rtems-libbsd - branch = grisp + url = git://git.rtems.org/rtems-libbsd.git + branch = 5-freebsd-12 [submodule "rtems-source-builder"] path = rtems-source-builder url = git://git.rtems.org/rtems-source-builder.git diff --git a/build/build-libbsd.sh b/build/build-libbsd.sh index 61bc009..df50cc7 100755 --- a/build/build-libbsd.sh +++ b/build/build-libbsd.sh @@ -14,6 +14,8 @@ PROJECTDIR="${SCRIPTDIR}/../" . "${SCRIPTDIR}/configuration.sh" export PATH="${PREFIX}/bin:${PATH}" +WAF="${PROJECTDIR}/rtems-libbsd/waf" + cd "${LIBBSD_SOURCE_DIR}" if [ "$BSP_NAME" = "atsamv" ] @@ -55,15 +57,15 @@ then fi fi -waf configure \ +python3 $WAF configure \ --prefix="${PREFIX}" \ --rtems-bsps="${RTEMS_CPU}/${BSP_NAME}" \ --buildset="${SCRIPTDIR}/libbsd-buildset.ini" -waf +python3 $WAF if [ $DO_INSTALL -ne 0 ] then - waf install + python3 $WAF install fi if [ "$BSP_NAME" = "atsamv" ] diff --git a/rtems b/rtems index b131cb2..7a1934d 160000 --- a/rtems +++ b/rtems @@ -1 +1 @@ -Subproject commit b131cb2aa035e6176e6ef362f09e39778f9063cb +Subproject commit 7a1934dac087295b209563d984549a48728599a3 diff --git a/rtems-libbsd b/rtems-libbsd index 1e77a45..eb1d30a 160000 --- a/rtems-libbsd +++ b/rtems-libbsd @@ -1 +1 @@ -Subproject commit 1e77a45d54bfc52eb76453f3e1327645acc8f77b +Subproject commit eb1d30ad351ed18116acbd8b224ed8e07d6627d0 diff --git a/rtems-source-builder b/rtems-source-builder index d2d4678..9c825f0 160000 --- a/rtems-source-builder +++ b/rtems-source-builder @@ -1 +1 @@ -Subproject commit d2d46786f113ed39d29deafa3feeb4d42ae94001 +Subproject commit 9c825f0b9a4eff4f87d22e12d3c94072712c3918 From 8f7399b9b722f3d048d1f2e0a5f1ac757ecc737d Mon Sep 17 00:00:00 2001 From: Adam Lindberg Date: Tue, 26 Mar 2019 11:03:17 +0100 Subject: [PATCH 11/11] Revert CircleCI changes Revert "Test OTP build with new toolchain" This reverts commit cd73e8f90dea5bdd72060cb67e55ce9bf645ecad. Revert "Add dmesg output to CI artifacts" This reverts commit 7f51e9ec30cdc495cedb3cabd1c4aedba3c37231. Revert "Store rsb-report artifact when build fails" This reverts commit 81dd5fdab4a931631d941912e1a0415617db0e1d. Revert "Add status badge" This reverts commit bed8dd7f74915ddd2a917435602f455758a5cf9c. Revert "Add CircleCI config" This reverts commit a56f8f558977b93186624f0763378c67c3c37c2f. --- .circleci/config.yml | 79 -------------------------------------------- README.asciidoc | 4 +-- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index e6000b5..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,79 +0,0 @@ -version: 2.1 -orbs: - grisp: grisp/grisp@0.0.2 -jobs: - build-toolchain: - docker: - - image: 'opensuse:leap' - steps: - - run: 'zypper install -y --type pattern devel_basis devel_C_C++' - - run: 'zypper install -y git python3-devel python-devel gcc-c++ unzip' - - run: - name: Set path variable - command: | - SHORT_SHA1=$(echo "${CIRCLE_SHA1}" | cut -c 1-10) - echo 'export TOOLCHAIN_PATH="/opt/grisp/grisp-software/grisp-base/'$SHORT_SHA1'"' >> $BASH_ENV - - run: mkdir -p ${TOOLCHAIN_PATH} - - checkout - - run: shopt -s dotglob && mv ./* "${TOOLCHAIN_PATH}" - - run: 'git -C "${TOOLCHAIN_PATH}" submodule update --init rtems-source-builder' - - run: - name: Disable parallelism during gcc build due to RAM limit at CircleCI - command: 'sed -i "s/%define with_threads 1/%define with_threads 0/" ${TOOLCHAIN_PATH}/rtems-source-builder/rtems/config/tools/rtems-gcc-7.3.0-newlib-3.0.0.cfg' - - run: - command: cd $TOOLCHAIN_PATH; ./build/build.sh - no_output_timeout: 90m - - run: - command: | - mkdir -p /tmp/rsb-reports - cp $TOOLCHAIN_PATH/rtems-source-builder/rtems/rsb-report* /tmp/rsb-reports - dmesg > /tmp/rsb-reports/dmesg_output.txt - when: on_fail - - store_artifacts: - path: /tmp/rsb-reports - - persist_to_workspace: - root: /opt - paths: - - grisp/*/*/*/rtems-install - build-otp: - docker: - - image: 'opensuse:leap' - steps: - - grisp/install-erlang - - grisp/install-rebar3 - - attach_workspace: - at: /opt - - grisp/create-grisp-project: - build-otp: true - deploy-destination: '/tmp/deploy' - - run: - command: source ~/.bashrc && rebar3 grisp build - working_directory: /root/ciproject - - run: - command: source ~/.bashrc && rebar3 grisp deploy -v 0.1.0 -n ciproject - working_directory: /root/ciproject - deploy-toolchain: - docker: - - image: 'opensuse:leap' - steps: - - run: 'zypper install -y aws-cli tar gzip' - - attach_workspace: - at: /opt - - run: - command: "GRISP_TOOLCHAIN_REVISION=$(cat /opt/grisp/*/*/*/rtems-install/rtems/5/GRISP_TOOLCHAIN_REVISION) && - tar -czf /tmp/grisp_toolchain_arm-rtems5_Linux_$GRISP_TOOLCHAIN_REVISION.tar.gz ." - working_directory: /opt - - deploy: - command: aws s3 cp /tmp/grisp_toolchain_*.tar.gz s3://grisp/platforms/grisp_base/toolchain/ --acl public-read -workflows: - version: 2 - build-deploy: - jobs: - - build-toolchain - - build-otp: - requires: - - build-toolchain - - deploy-toolchain: - requires: - - build-toolchain - - build-otp diff --git a/README.asciidoc b/README.asciidoc index 17eb5aa..043a193 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,9 +1,7 @@ GRISP ===== - -image:https://circleci.com/gh/grisp/grisp-software/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/grisp/grisp-software/tree/master"] - :toc: + == Prerequisites - the +xz+ decompression tool needs to be installed