-
Notifications
You must be signed in to change notification settings - Fork 6.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
manifest: bsim: Do not import but replicate in main manifest #59023
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
This reverts commit 00130b7. Signed-off-by: Alberto Escolar Piedras <[email protected]>
zephyrbot
added
manifest
manifest-babblesim_ext_2G4_device_WLAN_actmod
manifest-babblesim_ext_2G4_device_burst_interferer
manifest-babblesim_base
manifest-babblesim_ext_2G4_libPhyComv1
manifest-babblesim_ext_2G4_channel_multiatt
manifest-babblesim_ext_2G4_device_playback
manifest-babblesim_ext_2G4_modem_magic
manifest-babblesim_ext_2G4_phy_v1
manifest-babblesim_ext_2G4_channel_NtNcable
manifest-babblesim_ext_libCryptov1
manifest-babblesim_ext_2G4_modem_BLE_simple
DNM
This PR should not be merged (Do Not Merge)
labels
Jun 7, 2023
The following west manifest projects have been modified in this Pull Request:
Note: This message is automatically posted and updated by the Manifest GitHub Action. |
carlescufi
reviewed
Jun 7, 2023
As the bsim repo is disabled by default, west list bsim -f {sha} fails. Instead get the revision field which works. Signed-off-by: Alberto Escolar Piedras <[email protected]>
carlescufi
approved these changes
Jun 7, 2023
The changes themselves LGTM, but before we merge this we need to decide betweent this approach and #57361. |
nashif
approved these changes
Jun 7, 2023
henrikbrixandersen
approved these changes
Jun 8, 2023
aescolar
added a commit
to aescolar/zephyr
that referenced
this pull request
Apr 18, 2024
Babblesim has been in the manifest as an optional set of west projects since zephyrproject-rtos#55696 and zephyrproject-rtos#59023 In principle we need one entry in the MAINTAINERS file per west project, but as these project are optional, entries for them were never added. If a user has these babblesim project group enabled locally, checkcompliance MaintainersFormat check will warn though. So let's fix this by adding the respective entries in the MAINTAINERS file. Signed-off-by: Alberto Escolar Piedras <[email protected]>
nashif
pushed a commit
that referenced
this pull request
Apr 23, 2024
Babblesim has been in the manifest as an optional set of west projects since #55696 and #59023 In principle we need one entry in the MAINTAINERS file per west project, but as these project are optional, entries for them were never added. If a user has these babblesim project group enabled locally, checkcompliance MaintainersFormat check will warn though. So let's fix this by adding the respective entries in the MAINTAINERS file. Signed-off-by: Alberto Escolar Piedras <[email protected]>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 24, 2024
Babblesim has been in the manifest as an optional set of west projects since zephyrproject-rtos/zephyr#55696 and zephyrproject-rtos/zephyr#59023 In principle we need one entry in the MAINTAINERS file per west project, but as these project are optional, entries for them were never added. If a user has these babblesim project group enabled locally, checkcompliance MaintainersFormat check will warn though. So let's fix this by adding the respective entries in the MAINTAINERS file. (cherry picked from commit eddb382) Original-Signed-off-by: Alberto Escolar Piedras <[email protected]> GitOrigin-RevId: eddb382 Change-Id: Ieee5cae1c22fc7b1ec2303cec4150d6e34cc8f85 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5482306 Tested-by: ChromeOS Prod (Robot) <[email protected]> Tested-by: Dawid Niedźwiecki <[email protected]> Reviewed-by: Dawid Niedźwiecki <[email protected]> Commit-Queue: Dawid Niedźwiecki <[email protected]>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
Babblesim has been in the manifest as an optional set of west projects since zephyrproject-rtos#55696 and zephyrproject-rtos#59023 In principle we need one entry in the MAINTAINERS file per west project, but as these project are optional, entries for them were never added. If a user has these babblesim project group enabled locally, checkcompliance MaintainersFormat check will warn though. So let's fix this by adding the respective entries in the MAINTAINERS file. Signed-off-by: Alberto Escolar Piedras <[email protected]>
smaerup
pushed a commit
to smaerup/zephyr
that referenced
this pull request
May 1, 2024
Babblesim has been in the manifest as an optional set of west projects since zephyrproject-rtos#55696 and zephyrproject-rtos#59023 In principle we need one entry in the MAINTAINERS file per west project, but as these project are optional, entries for them were never added. If a user has these babblesim project group enabled locally, checkcompliance MaintainersFormat check will warn though. So let's fix this by adding the respective entries in the MAINTAINERS file. Signed-off-by: Alberto Escolar Piedras <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area: Continuous Integration
manifest
manifest-babblesim_base
manifest-babblesim_ext_libCryptov1
manifest-babblesim_ext_2G4_channel_multiatt
manifest-babblesim_ext_2G4_channel_NtNcable
manifest-babblesim_ext_2G4_device_burst_interferer
manifest-babblesim_ext_2G4_device_playback
manifest-babblesim_ext_2G4_device_WLAN_actmod
manifest-babblesim_ext_2G4_libPhyComv1
manifest-babblesim_ext_2G4_modem_BLE_simple
manifest-babblesim_ext_2G4_modem_magic
manifest-babblesim_ext_2G4_phy_v1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #57198