#514 Bootable Containers: Include DNF5 and bootc
Merged by siosm. Opened by siosm.
Unknown source main

Download 514.patch

Move dnf exclusion to classic ostree variants only

Prepare for DNF5 inclusion in Bootable Containers by moving the
exclusion to a manifest that is included only for the classic ostree
variants.

See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora


Bootable Containers: Include DNF5 and bootc

Add DNF5 and bootc to all Atomic Desktops Bootable Containers.

See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora
See: https://fedoraproject.org/wiki/Changes/SwitchToDnf5
See: https://pagure.io/fedora-comps/pull-request/960

Kinoite variants are temporarily excluded from this change until the
debuginfo plugin is available with DNF5 for DrKonqi.

See: https://pagure.io/fedora-kde/SIG/issue/519

rebased onto 9f06462522cf806c4c395f4e53362e56339e8cad

rebased onto dff5347e096c080448e69d3c2806eadbf7c01465

I pushed that change to the main branch of https://gitlab.com/fedora/ostree/ci-test. This is currently building in https://gitlab.com/fedora/ostree/ci-test/-/pipelines/1302308559/builds. That should make it easier to test.

For Kinoite:

error: Installing packages: Could not depsolve transaction; 1 problem detected:
 Problem: conflicting requests
  - package plasma-drkonqi-6.0.4-1.fc41.i686 from fedora-rawhide requires (dnf-command(debuginfo-install) if dnf), but none of the providers can be installed
  - package plasma-drkonqi-6.0.4-1.fc41.x86_64 from fedora-rawhide requires (dnf-command(debuginfo-install) if dnf), but none of the providers can be installed
  - package dnf5-plugins-5.2.1.0-1.fc41.x86_64 from fedora-rawhide requires dnf5(x86-64) = 5.2.1.0-1.fc41, but none of the providers can be installed
  - package dnf-plugins-core-4.7.0-1.fc41.noarch from fedora-rawhide is filtered out by exclude filtering

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/4e5a6fc387c24adbad95598f387e2fbb

This is still in missing upstream in DNF5:
- https://github.com/rpm-software-management/dnf5/issues/389
- https://github.com/rpm-software-management/dnf5/issues/846

rebased onto 6efdf1361bb44d2b09e88b5073bb9d4fc0813371

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/52fd01e190c64b6986d278f6deb072dc

https://pagure.io/fedora-kde/SIG/issue/519

rebased onto 5e3a12a17d8ec455aa688fa339553f44a9ad8e3b

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/916787a1e96f438d973297e4b69399db

rebased onto 8b18da4c148bd6e37b78af0b8e01c07ed9c22e42

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/f9f7c0c6e9424072a6c554c468eca8af

9 new commits added

  • Bootable Containers: Include DNF5 and bootc
  • ci/validate: Test by building a Bootable Container
  • Update justfile to compose -ostree for legacy
  • Add compatibility symlinks for classic ostree manifests
  • Split Bootable Containers manifest from classic ostree ones
  • Use new Atomic names
  • Update manifests names for variants and their package lists
  • Move common manifest includes to variants manifests
  • initramfs.yaml: Misc empty line fixup

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/df54dcaa0cb14bafaf2c1a66cbf55e08

rebased onto 457e89b5606c11f8158f22200973c818378e06d0

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/3278771e44724c52b062e958807ed773

$ for v in {silverblue,kinoite,sway-atomic,budgie-atomic}.yaml; do ~/projects/coreos/coreos-assembler/src/manifest_graph $v; echo ""; done
silverblue.yaml
├── silverblue-common.yaml
│   ├── common.yaml
│      ├── common-packages.yaml
│      ├── initramfs.yaml
│      └── sysroot-ro.yaml
│   └── silverblue-packages.yaml
└── dnf5-bootc.yaml
kinoite.yaml
└── kinoite-common.yaml
    ├── common.yaml
       ├── common-packages.yaml
       ├── initramfs.yaml
       └── sysroot-ro.yaml
    └── kinoite-packages.yaml
sway-atomic.yaml
├── sway-atomic-common.yaml
│   ├── common.yaml
│      ├── common-packages.yaml
│      ├── initramfs.yaml
│      └── sysroot-ro.yaml
│   └── sway-atomic-packages.yaml
└── dnf5-bootc.yaml
budgie-atomic.yaml
├── budgie-atomic-common.yaml
│   ├── common.yaml
│      ├── common-packages.yaml
│      ├── initramfs.yaml
│      └── sysroot-ro.yaml
│   └── budgie-atomic-packages.yaml
└── dnf5-bootc.yaml
$ for v in fedora-{silverblue,kinoite,sericea,onyx}.yaml; do ~/projects/coreos/coreos-assembler/src/manifest_graph $v; echo "" ; done
fedora-silverblue.yaml
└── (L) silverblue-ostree.yaml
    ├── silverblue-common.yaml
       ├── common.yaml
          ├── common-packages.yaml
          ├── initramfs.yaml
          └── sysroot-ro.yaml
       └── silverblue-packages.yaml
    └── no-dnf.yaml
fedora-kinoite.yaml
└── (L) kinoite-ostree.yaml
    ├── kinoite-common.yaml
       ├── common.yaml
          ├── common-packages.yaml
          ├── initramfs.yaml
          └── sysroot-ro.yaml
       └── kinoite-packages.yaml
    └── no-dnf.yaml
fedora-sericea.yaml
└── (L) sway-atomic-ostree.yaml
    ├── sway-atomic-common.yaml
       ├── common.yaml
          ├── common-packages.yaml
          ├── initramfs.yaml
          └── sysroot-ro.yaml
       └── sway-atomic-packages.yaml
    └── no-dnf.yaml
fedora-onyx.yaml
└── (L) budgie-atomic-ostree.yaml
    ├── budgie-atomic-common.yaml
       ├── common.yaml
          ├── common-packages.yaml
          ├── initramfs.yaml
          └── sysroot-ro.yaml
       └── budgie-atomic-packages.yaml
    └── no-dnf.yaml

9 new commits added

  • Bootable Containers: Include DNF5 and bootc
  • ci/validate: Test by building a Bootable Container
  • Update justfile to compose -ostree for legacy
  • Add compatibility symlinks for classic ostree manifests
  • Split Bootable Containers manifest from classic ostree ones
  • Use new Atomic names
  • Update manifests names for variants and their package lists
  • Move common manifest includes to variants manifests
  • initramfs.yaml: Misc empty line fixup

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/2fbd1f66485b426892393f047360893a

rebased onto 3bd5718f4a10211104202338ba3d18edd6b2756a

This change has been accepted: https://pagure.io/fesco/issue/3216

rebased onto 3bd5718f4a10211104202338ba3d18edd6b2756a

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/540d083703a342758f91cf9c2108c0de

rebased onto 65ddf54fd836df4e2a4924b964edb47dad9f5bed

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/98063715fb564f12b67950b8ce78e517

Pull-Request has been merged by siosm

Metadata