Skip to content
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

Remove soup from PACKAGECONFIG only if ptest is not enabled #108

Merged
merged 1 commit into from
Aug 28, 2024

Conversation

quic-roshs
Copy link
Contributor

I am working to enable ostree in my yocto build using meta-updater.

I see a build issue related to ostree-ptest when ptest is enabled as part of the distro features. It seems like ostree-ptest has a dependency on ostree-trivial-httpd and it breaks on removing soup from PACKAGECONFIG.

This change is to remove soup only if ptest is not enabled.

Build, boot up and ota update are successful with this change.

@ricardosalveti
Copy link
Collaborator

Please update the first patch to include your signed-off-by and drop the second and the third, not needed.

Can you also change the commit message to be 'ostree: remove soup...', easier to identify that this change is specific to the ostree recipe.

@quic-roshs quic-roshs force-pushed the quic-roshs-patch-1 branch 2 times, most recently from a055a23 to 67afb95 Compare August 27, 2024 06:58
@quic-roshs
Copy link
Contributor Author

Hi Ricardo,

Thanks for the comments. Made all the changes.

@ricardosalveti
Copy link
Collaborator

@quic-roshs minor thing, can you update your author line to have your name instead?

It is currently:
Author: quic-roshs <quic_roshs@quicinc.com>

ostree-ptest has a dependency on ostree-trivial-httpd which gets
compiled only if soup is enabled.

Signed-off-by: Roshan Sivakumar <quic_roshs@quicinc.com>
@quic-roshs
Copy link
Contributor Author

Done

Copy link
Collaborator

@ricardosalveti ricardosalveti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ricardosalveti ricardosalveti merged commit 68865c1 into uptane:master Aug 28, 2024
1 check passed
quic-roshs pushed a commit to quic-roshs/meta-updater that referenced this pull request Aug 28, 2024
f88fb5fae (HEAD -> master, origin/master, origin/HEAD) Merge pull request uptane#112 from uptane/fix/garage-cli
cf48737d1 Fetch garage-sign from a new location
3662ed09e Merge pull request uptane#108 from cajun-rat/correlation-id
45047239d Add default to load installed version with correlation id
146d347d8 Move CorrelationID up a level out of Target
dad1cbe27 Merge pull request uptane#109 from cajun-rat/various-tidy
cdc604ba1 Merge pull request uptane#110 from uptane/header-fix
13e9eb4f0 Merge pull request uptane#111 from uptane/docs/contributing
febb95cce Docs: Update CONTRIBUTING to reflect new policies
c0bf7314f Add missing include
cc33025e1 Various tidy-ups
513aadfaf Merge pull request uptane#107 from cajun-rat/more-flow-control
91ead679b Introduce finer-grained cancellation of operations

Signed-off-by: Jose Manuel Diez <j.diezlopez@tu-berlin.de>
(cherry picked from commit 2a83537)
Signed-off-by: Eduardo Ferreira <eduardo.barbosa@toradex.com>
EdTheBearded pushed a commit to EdTheBearded/meta-updater that referenced this pull request Oct 30, 2024
f88fb5fae (HEAD -> master, origin/master, origin/HEAD) Merge pull request uptane#112 from uptane/fix/garage-cli
cf48737d1 Fetch garage-sign from a new location
3662ed09e Merge pull request uptane#108 from cajun-rat/correlation-id
45047239d Add default to load installed version with correlation id
146d347d8 Move CorrelationID up a level out of Target
dad1cbe27 Merge pull request uptane#109 from cajun-rat/various-tidy
cdc604ba1 Merge pull request uptane#110 from uptane/header-fix
13e9eb4f0 Merge pull request uptane#111 from uptane/docs/contributing
febb95cce Docs: Update CONTRIBUTING to reflect new policies
c0bf7314f Add missing include
cc33025e1 Various tidy-ups
513aadfaf Merge pull request uptane#107 from cajun-rat/more-flow-control
91ead679b Introduce finer-grained cancellation of operations

Signed-off-by: Jose Manuel Diez <j.diezlopez@tu-berlin.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants