2024-02-27 17:43:36 +00:00
|
|
|
# Manifests for Fedora Atomic Desktops variants
|
2021-11-18 16:37:22 +00:00
|
|
|
|
|
|
|
This is the configuration needed to create
|
2024-02-27 17:43:36 +00:00
|
|
|
[rpm-ostree](https://coreos.github.io/rpm-ostree/) based, desktop variants of
|
|
|
|
Fedora, also known as
|
|
|
|
[Fedora Atomic Desktops](https://fedoraproject.org/atomic-desktops/).
|
|
|
|
|
|
|
|
This repo is managed by the
|
|
|
|
[Fedora Atomic Desktops SIG](https://fedoraproject.org/wiki/SIGs/AtomicDesktops).
|
|
|
|
|
|
|
|
The currently official Fedora Atomic Desktop variants are:
|
|
|
|
|
|
|
|
- Fedora Silverblue
|
|
|
|
- Fedora Kinoite
|
|
|
|
- Fedora Sway Atomic
|
|
|
|
- Fedora Budgie Atomic
|
|
|
|
|
|
|
|
Reach out to the SIG if you are interested in creating and maintaining a new
|
|
|
|
Atomic variant.
|
|
|
|
|
|
|
|
## Repository content
|
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
Each variant is described in a YAML
|
|
|
|
[treefile](https://coreos.github.io/rpm-ostree/treefile/) which is then used by
|
|
|
|
rpm-ostree to compose an ostree commit with the package requested.
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
In the Fedora infrastructure, composes are made via
|
|
|
|
[pungi](https://pagure.io/pungi) with the configuration from:
|
|
|
|
|
|
|
|
- for Rawhide and branched composes:
|
|
|
|
[pagure.io/pungi-fedora](https://pagure.io/pungi-fedora)
|
|
|
|
- for stable releases:
|
|
|
|
[pagure.io/fedora-infra](https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2)
|
|
|
|
|
|
|
|
Installer ISOs are built using [Lorax](https://github.com/weldr/lorax) and
|
|
|
|
additional templates:
|
|
|
|
[pagure.io/fedora-lorax-templates](https://pagure.io/fedora-lorax-templates).
|
|
|
|
|
|
|
|
## Website
|
|
|
|
|
|
|
|
The sources for the
|
|
|
|
[Silverblue](https://fedoraproject.org/atomic-desktops/silverblue/),
|
|
|
|
[Kinoite](https://fedoraproject.org/atomic-desktops/kinoite/),
|
|
|
|
[Sway Atomic](https://fedoraproject.org/atomic-desktops/sway/) and
|
|
|
|
[Budgie Atomic](https://fedoraproject.org/atomic-desktops/budgie/) websites are
|
|
|
|
in [gitlab.com/fedora/fedora-websites-3.0](https://gitlab.com/fedora/websites-apps/fedora-websites/fedora-websites-3.0).
|
|
|
|
|
|
|
|
## Issue trackers
|
|
|
|
|
|
|
|
Issues common to all Fedora Atomic Desktops are tracked in
|
|
|
|
[gitlab.com/fedora/ostree/sig](https://gitlab.com/fedora/ostree/sig/-/issues).
|
|
|
|
|
|
|
|
Desktop specific issues should be filed in their respective issue trackers:
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
- [Silverblue](https://github.com/fedora-silverblue/issue-tracker/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc)
|
|
|
|
- See also the [Workstation issue tracker](https://pagure.io/fedora-workstation/issues?status=Open&order_key=last_updated&order=desc)
|
|
|
|
- [Kinoite](https://pagure.io/fedora-kde/SIG/issues?status=Open&order_key=last_updated&order=desc)
|
|
|
|
([KDE SIG](https://fedoraproject.org/wiki/SIGs/KDE))
|
|
|
|
- [Sway Atomic](https://gitlab.com/fedora/sigs/sway/SIG/-/issues)
|
|
|
|
([Sway SIG](https://fedoraproject.org/wiki/SIGs/Sway))
|
|
|
|
- [Budgie Atomic](https://pagure.io/fedora-budgie/project/issues?status=Open&order_key=last_updated&order=desc)
|
|
|
|
([Budgie SIG](https://fedoraproject.org/wiki/SIGs/Budgie))
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
## Documentation
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
The documentation for Fedora Atomic variants is currently duplicated for each
|
|
|
|
variant at [Atomic Desktops](https://docs.fedoraproject.org/en-US/emerging/).
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
There are plans to unify the documentation:
|
|
|
|
[ostree/sig#10](https://gitlab.com/fedora/ostree/sig/-/issues/10)
|
|
|
|
|
|
|
|
Documentation sources:
|
|
|
|
|
|
|
|
- [Silverblue](https://github.com/fedora-silverblue/silverblue-docs)
|
|
|
|
- [Kinoite](https://pagure.io/fedora-kde/kinoite-docs)
|
|
|
|
- [Sway Atomic](https://gitlab.com/fedora/sigs/sway/sericea-docs)
|
|
|
|
- Budgie Atomic (to be determined)
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
## Building
|
2017-12-01 21:44:43 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
All commonly used commands are listed as recipes in the
|
|
|
|
[justfile](https://github.com/casey/just) (see
|
|
|
|
[Just](https://github.com/casey/just)).
|
|
|
|
|
|
|
|
Example to do a local build of Fedora Silverblue:
|
2017-08-07 16:41:21 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
```
|
|
|
|
# Clone the config
|
2024-02-27 17:43:36 +00:00
|
|
|
$ git clone https://pagure.io/workstation-ostree-config && cd workstation-ostree-config
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
# Build the classic ostree commits (currently the default in Fedora)
|
|
|
|
$ just compose-legacy variant=silverblue
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
# Or build the new ostree native container (not default yet, still in development)
|
|
|
|
$ just compose-image variant=silverblue
|
2021-11-18 16:37:22 +00:00
|
|
|
```
|
2017-08-30 17:43:54 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
## Testing
|
2017-08-30 17:43:54 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
Instructions to test the resulting build for classic ostree commits:
|
2017-08-30 17:43:54 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
- First, serve the ostree repo using an HTTP server. You can use any static
|
|
|
|
file server. For example using
|
|
|
|
<https://github.com/TheWaWaR/simple-http-server>:
|
2022-08-19 19:06:08 +00:00
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
```
|
|
|
|
simple-http-server --index --ip 192.168.122.1 --port 8000
|
|
|
|
```
|
2022-08-19 19:06:08 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
- Then, on an already installed Silverblue system:
|
2017-07-05 20:27:17 +00:00
|
|
|
|
|
|
|
```
|
2021-11-18 16:37:22 +00:00
|
|
|
# Add an ostree remote
|
2022-08-19 19:06:08 +00:00
|
|
|
sudo ostree remote add testremote http://192.168.122.1:8000/repo --no-gpg-verify
|
2021-11-18 16:37:22 +00:00
|
|
|
|
|
|
|
# Pin the currently deployed (and probably working) version
|
|
|
|
sudo ostree admin pin 0
|
|
|
|
|
|
|
|
# List refs from variant remote
|
|
|
|
sudo ostree remote refs testremote
|
|
|
|
|
|
|
|
# Switch to your variant
|
2022-08-19 19:06:08 +00:00
|
|
|
sudo rpm-ostree rebase testremote:fedora/rawhide/x86_64/silverblue
|
|
|
|
|
|
|
|
# Reboot and test!
|
2017-07-05 20:27:17 +00:00
|
|
|
```
|
|
|
|
|
2024-02-27 17:43:36 +00:00
|
|
|
Instructions to test the resulting build for ostree native containers:
|
|
|
|
|
|
|
|
- Push the OCI archive to a container registry
|
|
|
|
- Rebase to it:
|
|
|
|
|
|
|
|
```
|
|
|
|
$ rpm-ostree rebase ostree-unverified-image:registry:<oci image>
|
|
|
|
```
|
|
|
|
|
|
|
|
See [URL format for ostree native containers](https://coreos.github.io/rpm-ostree/container/#url-format-for-ostree-native-containers) for details.
|
|
|
|
|
2024-06-10 19:30:29 +00:00
|
|
|
## Syncing with Fedora Comps
|
|
|
|
|
|
|
|
[Fedora Comps](https://pagure.io/fedora-comps) are "XML files used by various
|
|
|
|
Fedora tools to perform grouping of packages into functional groups."
|
|
|
|
|
2024-06-11 13:27:45 +00:00
|
|
|
Changes to the comps files need to be regularly propagated to this repo so that
|
2024-06-10 19:30:29 +00:00
|
|
|
the Fedora Atomic variants are kept updated with the other desktop variants.
|
|
|
|
|
2024-06-11 13:27:45 +00:00
|
|
|
### Using `just`
|
|
|
|
|
|
|
|
If you have the `just` command installed, you can run `just comps-sync` from a
|
|
|
|
`git` checkout of this repo to update the packages included in the Fedora Atomic
|
|
|
|
variants. Examine the changes and cross-reference them with PRs made to the
|
|
|
|
`fedora-comps` repo. Create a pull request with the changes and note any PRs from
|
|
|
|
`fedora-comps` in the commit message that are relevant to the changes you have
|
|
|
|
generated.
|
|
|
|
|
|
|
|
### Using `comps-sync.py` directly
|
|
|
|
|
|
|
|
If you don't have `just` installed or want to run the `comps-sync.py` script
|
|
|
|
directly, you need to have an up-to-date `git` checkout of
|
|
|
|
https://pagure.io/fedora-comps and a `git` checkout of this repository.
|
2024-06-10 19:30:29 +00:00
|
|
|
|
|
|
|
Using the `comps-sync.py` script, provide the updated input XML file to examine
|
|
|
|
the changes as a dry-run:
|
|
|
|
|
|
|
|
`$ ./comps-sync.py /path/to/fedora-comps/comps-f41.xml.in`
|
|
|
|
|
|
|
|
Examine the changes and cross-reference them with PRs made to the `fedora-comps`
|
|
|
|
repo. When you are satisfied that the changes are accurate and appear safe,
|
|
|
|
re-run the script with the `--save` option:
|
|
|
|
|
|
|
|
`$ ./comps-sync.py --save /path/to/fedora-comps/comps-f41.xml.in`
|
|
|
|
|
|
|
|
Create a pull request with the changes and note any PRs from `fedora-comps`
|
|
|
|
in the commit message that are relevant to the changes you have generated.
|
|
|
|
|
2023-08-09 11:03:02 +00:00
|
|
|
## Branching instructions for new Fedora releases
|
|
|
|
|
|
|
|
Follow those steps during the Fedora branch process in Fedora:
|
|
|
|
|
|
|
|
### Fedora Ansible
|
|
|
|
|
|
|
|
Make a PR similar to
|
|
|
|
[ansible#1318](https://pagure.io/fedora-infra/ansible/pull-request/1318) in
|
|
|
|
[fedora-infra/ansible](https://pagure.io/fedora-infra/ansible).
|
|
|
|
|
|
|
|
### On Rawhide / main branch
|
|
|
|
|
|
|
|
```
|
2024-02-15 17:47:56 +00:00
|
|
|
sed -i "s/41/42/g" *.repo comps-sync.py
|
|
|
|
sed -i "s/releasever: 41/releasever: 42/" fedora-common-ostree.yaml
|
2024-02-21 01:24:40 +00:00
|
|
|
sed -i "s/# - fedora-41/# - fedora-42/" fedora-*.yaml
|
2024-02-14 09:53:51 +00:00
|
|
|
mv fedora-41.repo fedora-42.repo
|
|
|
|
mv fedora-41-updates.repo fedora-42-updates.repo
|
|
|
|
sed -i "s/42/42/g" README.md
|
2023-08-09 11:03:02 +00:00
|
|
|
sed -i "s/41/42/g" README.md
|
|
|
|
```
|
|
|
|
|
2024-02-14 09:53:51 +00:00
|
|
|
### On the new branch (f41)
|
2023-08-09 11:03:02 +00:00
|
|
|
|
|
|
|
```
|
|
|
|
rm fedora-rawhide.repo
|
2024-02-21 01:24:40 +00:00
|
|
|
sed -i "/- fedora-rawhide/d" fedora-*.yaml
|
|
|
|
sed -i "s/# - fedora-41/- fedora-41/" fedora-*.yaml
|
|
|
|
sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" fedora-*.yaml
|
2023-08-09 11:03:02 +00:00
|
|
|
```
|
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
## Historical references
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
Building and testing instructions:
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
- https://dustymabe.com/2017/10/05/setting-up-an-atomic-host-build-server/
|
|
|
|
- https://dustymabe.com/2017/08/08/how-do-we-create-ostree-repos-and-artifacts-in-fedora/
|
|
|
|
- https://www.projectatomic.io/blog/2017/12/compose-custom-ostree/
|
|
|
|
- https://www.projectatomic.io/docs/compose-your-own-tree/
|
|
|
|
|
|
|
|
For some background, see:
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
- <https://fedoraproject.org/wiki/Workstation/AtomicWorkstation>
|
|
|
|
- <https://fedoraproject.org/wiki/Changes/WorkstationOstree>
|
|
|
|
- <https://fedoraproject.org/wiki/Changes/Silverblue>
|
|
|
|
- <https://fedoraproject.org/wiki/Changes/Fedora_Kinoite>
|
2017-07-05 20:27:17 +00:00
|
|
|
|
2021-11-18 16:37:22 +00:00
|
|
|
Note also this repo obsoletes https://pagure.io/atomic-ws
|