From 8120bd751952221a07b9e3c553a4a0f43e6ca40d Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Fri, 10 May 2024 09:59:01 +0200 Subject: [PATCH] samples: move with_mcuboot sample to samples/sysbuild This creates a new category of samples that demonstrate certain features of sysbuild. "application development" was a very generic name. Signed-off-by: Gerard Marull-Paretas --- MAINTAINERS.yml | 4 ++-- doc/_scripts/redirects.py | 1 + samples/index.rst | 1 + samples/sysbuild/sysbuild.rst | 10 ++++++++++ .../sysbuild/with_mcuboot/CMakeLists.txt | 0 .../sysbuild/with_mcuboot/README.rst | 0 .../sysbuild/with_mcuboot/prj.conf | 0 .../sysbuild/with_mcuboot/sample.yaml | 2 +- .../sysbuild/with_mcuboot/src/main.c | 0 .../sysbuild/with_mcuboot/sysbuild.conf | 0 .../sysbuild/with_mcuboot/sysbuild/mcuboot.conf | 0 11 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 samples/sysbuild/sysbuild.rst rename samples/{application_development => }/sysbuild/with_mcuboot/CMakeLists.txt (100%) rename samples/{application_development => }/sysbuild/with_mcuboot/README.rst (100%) rename samples/{application_development => }/sysbuild/with_mcuboot/prj.conf (100%) rename samples/{application_development => }/sysbuild/with_mcuboot/sample.yaml (90%) rename samples/{application_development => }/sysbuild/with_mcuboot/src/main.c (100%) rename samples/{application_development => }/sysbuild/with_mcuboot/sysbuild.conf (100%) rename samples/{application_development => }/sysbuild/with_mcuboot/sysbuild/mcuboot.conf (100%) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 42e70bdb0b6..77f9820f681 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -3761,12 +3761,12 @@ Sysbuild: - "57300" files: - share/sysbuild/ - - samples/application_development/sysbuild/ + - samples/sysbuild/ - doc/build/sysbuild/ labels: - "area: Sysbuild" tests: - - sample.application_development.sysbuild + - sample.sysbuild Task Watchdog: status: maintained diff --git a/doc/_scripts/redirects.py b/doc/_scripts/redirects.py index bf4f9262749..91586470fea 100644 --- a/doc/_scripts/redirects.py +++ b/doc/_scripts/redirects.py @@ -199,6 +199,7 @@ REDIRECTS = [ ('reference/usermode/overview', 'kernel/usermode/overview'), ('reference/usermode/syscalls', 'kernel/usermode/syscalls'), ('reference/util/index', 'kernel/util/index'), + ('samples/application_development/with_mcuboot/README', 'samples/sysbuild/with_mcuboot/README'), ('samples/drivers/adc/README', 'samples/drivers/adc/adc_dt/README'), ('samples/drivers/kscan_touch', 'samples/subsys/input/input'), ('samples/drivers/led_apa102/README', 'samples/drivers/led_strip/README'), diff --git a/samples/index.rst b/samples/index.rst index 8581a330d40..0120c87769d 100644 --- a/samples/index.rst +++ b/samples/index.rst @@ -13,6 +13,7 @@ Samples and Demos classic basic/* userspace/* + sysbuild/* subsys/subsys.rst net/net.rst bluetooth/bluetooth.rst diff --git a/samples/sysbuild/sysbuild.rst b/samples/sysbuild/sysbuild.rst new file mode 100644 index 00000000000..c959e82a3a3 --- /dev/null +++ b/samples/sysbuild/sysbuild.rst @@ -0,0 +1,10 @@ +.. _sysbuild-samples: + +Sysbuild samples +################ + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/samples/application_development/sysbuild/with_mcuboot/CMakeLists.txt b/samples/sysbuild/with_mcuboot/CMakeLists.txt similarity index 100% rename from samples/application_development/sysbuild/with_mcuboot/CMakeLists.txt rename to samples/sysbuild/with_mcuboot/CMakeLists.txt diff --git a/samples/application_development/sysbuild/with_mcuboot/README.rst b/samples/sysbuild/with_mcuboot/README.rst similarity index 100% rename from samples/application_development/sysbuild/with_mcuboot/README.rst rename to samples/sysbuild/with_mcuboot/README.rst diff --git a/samples/application_development/sysbuild/with_mcuboot/prj.conf b/samples/sysbuild/with_mcuboot/prj.conf similarity index 100% rename from samples/application_development/sysbuild/with_mcuboot/prj.conf rename to samples/sysbuild/with_mcuboot/prj.conf diff --git a/samples/application_development/sysbuild/with_mcuboot/sample.yaml b/samples/sysbuild/with_mcuboot/sample.yaml similarity index 90% rename from samples/application_development/sysbuild/with_mcuboot/sample.yaml rename to samples/sysbuild/with_mcuboot/sample.yaml index 785bc0d2400..e1f456405a7 100644 --- a/samples/application_development/sysbuild/with_mcuboot/sample.yaml +++ b/samples/sysbuild/with_mcuboot/sample.yaml @@ -2,7 +2,7 @@ sample: description: Sample with MCUboot built through sysbuild name: with mcuboot tests: - sample.application_development.sysbuild.with_mcuboot: + sample.sysbuild.with_mcuboot: sysbuild: true # Platform allowed is used as twister using sysbuild still lacks proper # filtering support, see discussion in #49552. diff --git a/samples/application_development/sysbuild/with_mcuboot/src/main.c b/samples/sysbuild/with_mcuboot/src/main.c similarity index 100% rename from samples/application_development/sysbuild/with_mcuboot/src/main.c rename to samples/sysbuild/with_mcuboot/src/main.c diff --git a/samples/application_development/sysbuild/with_mcuboot/sysbuild.conf b/samples/sysbuild/with_mcuboot/sysbuild.conf similarity index 100% rename from samples/application_development/sysbuild/with_mcuboot/sysbuild.conf rename to samples/sysbuild/with_mcuboot/sysbuild.conf diff --git a/samples/application_development/sysbuild/with_mcuboot/sysbuild/mcuboot.conf b/samples/sysbuild/with_mcuboot/sysbuild/mcuboot.conf similarity index 100% rename from samples/application_development/sysbuild/with_mcuboot/sysbuild/mcuboot.conf rename to samples/sysbuild/with_mcuboot/sysbuild/mcuboot.conf