Skip to content

Commit f30f08a

Browse files
nashifjhedberg
authored andcommitted
manifest: move optional modules to a submanifest and make them optional
Move optional modules to a submanifest and make them optional by default. This is just a POC, might require some more thought. The idea is to look at the optional manifest as an area for modules that work with Zephyr, but not needed directly by zephyr. This could be documented somewhere for discovery purposes allowing users to enable such modules in their downstream if desired. See zephyrproject-rtos#54276 Signed-off-by: Anas Nashif <[email protected]>
1 parent 1211d77 commit f30f08a

File tree

2 files changed

+61
-32
lines changed

2 files changed

+61
-32
lines changed

submanifests/optional.yaml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
manifest:
2+
remotes:
3+
- name: upstream
4+
url-base: https://github.com/zephyrproject-rtos
5+
projects:
6+
- name: chre
7+
revision: b7955c27e50485b7dafdc3888d7d6afdc2ac6d96
8+
path: modules/lib/chre
9+
remote: upstream
10+
groups:
11+
- optional
12+
- name: lz4
13+
revision: 8e303c264fc21c2116dc612658003a22e933124d
14+
path: modules/lib/lz4
15+
remote: upstream
16+
groups:
17+
- optional
18+
- name: nanopb
19+
revision: 42fa8b211e946b90b9d968523fce7b1cfe27617e
20+
path: modules/lib/nanopb
21+
remote: upstream
22+
groups:
23+
- optional
24+
- name: psa-arch-tests
25+
revision: 6a17330e0dfb5f319730f974d5b05f7b7f04757b
26+
path: modules/tee/tf-m/psa-arch-tests
27+
remote: upstream
28+
groups:
29+
- optional
30+
- name: sof
31+
revision: c0f20b69daa44e3563f970b366e49ccfcfa1b71c
32+
path: modules/audio/sof
33+
remote: upstream
34+
groups:
35+
- optional
36+
- name: tf-m-tests
37+
revision: a878426da78fbd1486dfc29d6c6b82be4ee79e72
38+
path: modules/tee/tf-m/tf-m-tests
39+
remote: upstream
40+
groups:
41+
- optional
42+
- name: tflite-micro
43+
revision: 1a34dcab41e7e0e667db72d6a40999c1ec9c510c
44+
path: optional/modules/lib/tflite-micro
45+
repo-path: tflite-micro
46+
remote: upstream
47+
groups:
48+
- optional
49+
- name: thrift
50+
path: optional/modules/lib/thrift
51+
revision: 10023645a0e6cb7ce23fcd7fd3dbac9f18df6234
52+
remote: upstream
53+
groups:
54+
- optional
55+
- name: zscilib
56+
path: modules/lib/zscilib
57+
revision: 34c3432e81085bb717e4871d21ca419ae0058ec5
58+
remote: upstream
59+
groups:
60+
- optional

west.yml

+1-32
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ manifest:
2424
- name: babblesim
2525
url-base: https://github.com/BabbleSim
2626

27-
group-filter: [-babblesim]
27+
group-filter: [-babblesim, -optional]
2828

2929
#
3030
# Please add items below based on alphabetical order
@@ -118,9 +118,6 @@ manifest:
118118
- name: canopennode
119119
revision: dec12fa3f0d790cafa8414a4c2930ea71ab72ffd
120120
path: modules/lib/canopennode
121-
- name: chre
122-
revision: b7955c27e50485b7dafdc3888d7d6afdc2ac6d96
123-
path: modules/lib/chre
124121
- name: cmsis
125122
revision: 5a00331455dd74e31e80efa383a489faea0590e3
126123
path: modules/hal/cmsis
@@ -278,9 +275,6 @@ manifest:
278275
- name: lvgl
279276
revision: 8a6a2d1d29d17d1e4bdc94c243c146a39d635fdd
280277
path: modules/lib/gui/lvgl
281-
- name: lz4
282-
revision: 8e303c264fc21c2116dc612658003a22e933124d
283-
path: modules/lib/lz4
284278
- name: mbedtls
285279
revision: c38dc78d9a8dcbe43b898cc1171ab33ba3e6fc26
286280
path: modules/crypto/mbedtls
@@ -294,9 +288,6 @@ manifest:
294288
groups:
295289
- debug
296290
revision: a819419603a2dfcb47f7f39092e1bc112e45d1ef
297-
- name: nanopb
298-
revision: 42fa8b211e946b90b9d968523fce7b1cfe27617e
299-
path: modules/lib/nanopb
300291
- name: net-tools
301292
revision: e0828aa9629b533644dc96ff6d1295c939bd713c
302293
path: tools/net-tools
@@ -324,12 +315,6 @@ manifest:
324315
path: modules/debug/segger
325316
groups:
326317
- debug
327-
- name: sof
328-
revision: c0f20b69daa44e3563f970b366e49ccfcfa1b71c
329-
path: modules/audio/sof
330-
- name: tflite-micro
331-
revision: 1a34dcab41e7e0e667db72d6a40999c1ec9c510c
332-
path: modules/lib/tflite-micro
333318
- name: tinycrypt
334319
revision: 3e9a49d2672ec01435ffbf0d788db6d95ef28de0
335320
path: modules/crypto/tinycrypt
@@ -345,28 +330,12 @@ manifest:
345330
path: modules/tee/tf-a/trusted-firmware-a
346331
groups:
347332
- tee
348-
- name: tf-m-tests
349-
revision: a878426da78fbd1486dfc29d6c6b82be4ee79e72
350-
path: modules/tee/tf-m/tf-m-tests
351-
groups:
352-
- tee
353-
- name: psa-arch-tests
354-
revision: 6a17330e0dfb5f319730f974d5b05f7b7f04757b
355-
path: modules/tee/tf-m/psa-arch-tests
356-
groups:
357-
- tee
358333
- name: uoscore-uedhoc
359334
revision: 5fe2cb613bd7e4590bd1b00c2adf181ac0229379
360335
path: modules/lib/uoscore-uedhoc
361336
- name: zcbor
362337
revision: 67fd8bb88d3136738661fa8bb5f9989103f4599e
363338
path: modules/lib/zcbor
364-
- name: zscilib
365-
path: modules/lib/zscilib
366-
revision: 34c3432e81085bb717e4871d21ca419ae0058ec5
367-
- name: thrift
368-
path: modules/lib/thrift
369-
revision: 10023645a0e6cb7ce23fcd7fd3dbac9f18df6234
370339

371340
self:
372341
path: zephyr

0 commit comments

Comments
 (0)