manifest: bsim: Do not import but replicate in main manifest

Due to a limitation in the west import feature,
a project cannot both have an import and be part of a group.
Moreover, when a project has an import and is not filtered
out, it is required for that project to be present
for most west commands to work.

As the bsim project is not filtered by default,
it causes trouble for users who never run a
west update but try to use west further.

To work around this issue, let's disable the import
in the bsim project, and instead replicate its content
inside Zephyr's main manifest.

Having a replica of the babblesim manifest content
is likely to cause some confusion in users,
wrt to which version of components they are using.
So whenever west supports both imports and groups, or another
simple and nicer way of working around this, it should be used.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2023-06-07 16:33:18 +02:00 committed by Anas Nashif
parent 433114edca
commit 9ce0d416f5

View file

@ -21,6 +21,8 @@ manifest:
remotes:
- name: upstream
url-base: https://github.com/zephyrproject-rtos
- name: babblesim
url-base: https://github.com/BabbleSim
group-filter: [-babblesim]
@ -30,8 +32,86 @@ manifest:
- name: bsim
repo-path: babblesim-manifest
revision: 908ffde6298a937c6549dbfa843a62caab26bfc5
import:
path-prefix: tools
path: tools/bsim
groups:
- babblesim
- name: babblesim_base
remote: babblesim
repo-path: base.git
path: tools/bsim/components
revision: 02838ca04c4562e68dc876196828d8121679e537
groups:
- babblesim
- name: babblesim_ext_2G4_libPhyComv1
remote: babblesim
repo-path: ext_2G4_libPhyComv1.git
path: tools/bsim/components/ext_2G4_libPhyComv1
revision: 9018113a362fa6c9e8f4b9cab9e5a8f12cc46b94
groups:
- babblesim
- name: babblesim_ext_2G4_phy_v1
remote: babblesim
repo-path: ext_2G4_phy_v1.git
path: tools/bsim/components/ext_2G4_phy_v1
revision: cf2d86e736efac4f12fad5093ed2da2c5b406156
groups:
- babblesim
- name: babblesim_ext_2G4_channel_NtNcable
remote: babblesim
repo-path: ext_2G4_channel_NtNcable.git
path: tools/bsim/components/ext_2G4_channel_NtNcable
revision: 20a38c997f507b0aa53817aab3d73a462fff7af1
groups:
- babblesim
- name: babblesim_ext_2G4_channel_multiatt
remote: babblesim
repo-path: ext_2G4_channel_multiatt.git
path: tools/bsim/components/ext_2G4_channel_multiatt
revision: e09bc2d14b1975f969ad19c6ed23eb20e5dc3d09
groups:
- babblesim
- name: babblesim_ext_2G4_modem_magic
remote: babblesim
repo-path: ext_2G4_modem_magic.git
path: tools/bsim/components/ext_2G4_modem_magic
revision: cb70771794f0bf6f262aa474848611c68ae8f1ed
groups:
- babblesim
- name: babblesim_ext_2G4_modem_BLE_simple
remote: babblesim
repo-path: ext_2G4_modem_BLE_simple.git
path: tools/bsim/components/ext_2G4_modem_BLE_simple
revision: ce975a3259fd0dd761d371b60435242d54794bad
groups:
- babblesim
- name: babblesim_ext_2G4_device_burst_interferer
remote: babblesim
repo-path: ext_2G4_device_burst_interferer.git
path: tools/bsim/components/ext_2G4_device_burst_interferer
revision: 5b5339351d6e6a2368c686c734dc8b2fc65698fc
groups:
- babblesim
- name: babblesim_ext_2G4_device_WLAN_actmod
remote: babblesim
repo-path: ext_2G4_device_WLAN_actmod.git
path: tools/bsim/components/ext_2G4_device_WLAN_actmod
revision: 9cb6d8e72695f6b785e57443f0629a18069d6ce4
groups:
- babblesim
- name: babblesim_ext_2G4_device_playback
remote: babblesim
repo-path: ext_2G4_device_playback.git
path: tools/bsim/components/ext_2G4_device_playback
revision: 85c645929cf1ce995d8537107d9dcbd12ed64036
groups:
- babblesim
- name: babblesim_ext_libCryptov1
remote: babblesim
repo-path: ext_libCryptov1.git
path: tools/bsim/components/ext_libCryptov1
revision: eed6d7038e839153e340bd333bc43541cb90ba64
groups:
- babblesim
- name: canopennode
revision: dec12fa3f0d790cafa8414a4c2930ea71ab72ffd
path: modules/lib/canopennode