Commit graph

71 commits

Author SHA1 Message Date
Timothée Ravier
0cb972a2c2 fedora-common-ostree: Remove unused 'ref'
We never directly compose this manifest. The minimal version of a
desktop less Atomic desktop is `fedora-base.yaml`.
2024-02-21 03:04:54 +01:00
Timothée Ravier
8ad09dc672 Revert: manifests: Move repos config to common manifest
Repos are overwritten by Pungi during composes in the Fedora infra and
Pungi currently only overwrites the leaf manifest.

See: https://pagure.io/releng/issue/11969
Reverts: 49db8be manifests: Move repos config to common manifest
2024-02-21 02:33:36 +01:00
Timothée Ravier
75c28076fc fedora-common-ostree: Use new parameter name for automatic-version-prefix 2024-02-15 18:50:19 +01:00
Timothée Ravier
adbfd6c912 fedora-common-ostree: Use releasever treefile parameter 2024-02-15 18:48:30 +01:00
Timothée Ravier
49db8be8e2 manifests: Move repos config to common manifest
Should simplify branching.
2024-02-14 11:11:11 +01:00
Timothée Ravier
02dd6f3469 Rawhide is now Fedora 41 (fixups)
Fixes: 635af64 Rawhide is now f41
2024-02-14 10:53:52 +01:00
Timothée Ravier
2df4e46351 fedora-common-ostree: bootupd available for all arches
bootupd is now available for the four main architectures supported in
Fedora: amd64, aarch64, ppc64le, s390x.

We only build Fedora Atomic desktops for amd64, aarch64, ppc64le.
2024-02-09 18:41:05 +01:00
Timothée Ravier
e165a55329 Reapply "fedora-common-ostree: Enable bootupd integration"
Now that we're building using unified core and that Anaconda has support
for bootupd, we can enable bootupd in Silverblue & friends.

See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueBootupd
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore
See: https://github.com/fedora-silverblue/issue-tracker/issues/530

Previous attempts:
- https://pagure.io/workstation-ostree-config/pull-request/288
- https://pagure.io/workstation-ostree-config/pull-request/293
- https://pagure.io/workstation-ostree-config/pull-request/307
- https://pagure.io/workstation-ostree-config/pull-request/313 (revert)
- https://pagure.io/workstation-ostree-config/pull-request/330
- https://pagure.io/workstation-ostree-config/pull-request/402 (revert)
- https://pagure.io/workstation-ostree-config/pull-request/403
- https://pagure.io/workstation-ostree-config/pull-request/452 (revert)

This reverts commit 148b6d236c.
2024-02-01 16:43:02 +01:00
Timothée Ravier
f6f7b24824 fedora-common-ostree: Workaround for SAMBA support in cups
RPM %triggerin are not currently supported in rpm-ostree, thus work
around this issue by manually creating the symlink.

According to the docs, `/usr/lib/cups/backend/smb` should point to `smbspool`.
Here we have the following chain:

/usr/lib/cups/backend/smb -> /usr/libexec/samba/cups_backend_smb -> /etc/alternatives/cups_backend_smb -> /usr/bin/smbspool

See: https://www.cups.org/blog/2005-06-17-printing-to-windows-servers-with-samba.html
See: https://github.com/coreos/rpm-ostree/issues/1180
See: https://github.com/fedora-silverblue/issue-tracker/issues/532
2024-02-01 16:38:54 +01:00
Timothée Ravier
488422ee63 fedora-common-ostree: Include langpacks-en 2024-01-26 12:34:21 +01:00
Timothée Ravier
148b6d236c Revert "fedora-common-ostree: Enable bootupd integration"
This reverts commit ad61c4d56e.
2024-01-24 18:45:39 +01:00
Timothée Ravier
ad61c4d56e fedora-common-ostree: Enable bootupd integration
Now that we're building using unified core and that Anaconda has support
for bootupd, we can enable bootupd in Silverblue & friends.

See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueBootupd
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore

Previous attempts:
- https://pagure.io/workstation-ostree-config/pull-request/288
- https://pagure.io/workstation-ostree-config/pull-request/293
- https://pagure.io/workstation-ostree-config/pull-request/307
- https://pagure.io/workstation-ostree-config/pull-request/313 (revert)
- https://pagure.io/workstation-ostree-config/pull-request/330
- https://pagure.io/workstation-ostree-config/pull-request/402 (revert)
2024-01-19 13:19:45 +01:00
Timothée Ravier
01dbc964df common: Explicitely set the date in version_prefix
Required to get the correct version with `rpm-ostree compose image`.
2024-01-19 13:19:45 +01:00
Timothée Ravier
6c2830c902 fedora-common-ostree: Prepare for ppc64le support in bootupd
As bootupd supports GRUB and ppc64le since 0.2.10, we wil be able to
enable it once we enable bootupd support in Silverblue & friends.

See: https://github.com/coreos/bootupd/pull/420
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueBootupd
2024-01-08 12:14:36 +01:00
Timothée Ravier
5d91fd955c fedora-common-ostree: Exclude grubby 2023-12-16 15:21:23 +01:00
Timothée Ravier
59ca203194 fedora-common-ostree: Exclude sdubby
See: https://github.com/fedora-silverblue/issue-tracker/issues/517
2023-12-14 11:41:27 +01:00
Timothée Ravier
dde8774aeb fedora-common-ostree: Add systemd-container
This pakage provides `machinectl` and `systemd-nspawn`, which is useful
as a container tools itself or as a better alternative to sudo to run
commands under another user in a clean shell session.

See: https://github.com/fedora-silverblue/issue-tracker/issues/503
2023-12-12 13:26:44 +00:00
Timothée Ravier
867a5c6d58 fedora-common-ostree: Do not exclude dnf-data
Needed for initial-setup-gui, which is still used in some variants.
2023-10-16 15:59:56 +02:00
Timothée Ravier
7211f15de2 fedora-common-ostree: Document nss-altfiles inclusion 2023-09-27 20:02:11 +02:00
Timothée Ravier
06fcdac6f3 comps-sync.py: Remove special case for kernel packages 2023-09-27 20:02:11 +02:00
Timothée Ravier
cf4dcc7206 comps-sync.py: Unify group loading logic 2023-09-27 10:53:32 +02:00
Debarshi Ray
0ef4a78e0d common-ostree: Remove redundant entry for toolbox
Toolbx was added to the default Fedora Workstation installation for
Fedora 37 [1].  Therefore, it already gets pulled in through
fedora-common-ostree-pkgs.yaml.

[1] fedora-comps commit cdbc1f4ee0f28684
    https://pagure.io/fedora-comps/c/cdbc1f4ee0f28684
    https://pagure.io/fedora-workstation/issue/320

https://pagure.io/workstation-ostree-config/pull-request/420
2023-09-01 10:30:13 +02:00
Timothée Ravier
8b74d30bd6 Revert "fedora-common-ostree: Add workaround for nfs-client.target"
Fixed by: https://src.fedoraproject.org/rpms/fedora-release/pull-request/267
See: https://bugzilla.redhat.com/show_bug.cgi?id=2218006

This reverts commit 32d3823b99.
2023-08-09 14:53:44 +02:00
Kevin Fenzi
a79ee9bcc3 rawhide moves on toward f40
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-08-08 15:54:22 -07:00
Timothée Ravier
b5cc3c0199 Revert "Enable bootupd integration now that we use unified core"
Need changes in Anaconda:

```
org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.common.task.task:Install the bootloader
org.fedoraproject.Anaconda.Modules.Storage:DEBUG:anaconda.modules.storage.bootloader.utils:Installing the boot loader.
org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.storage.bootloader.utils:boot loader stage1 target device is vda
org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.storage.bootloader.utils:boot loader stage2 target device is vda2
org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.storage.bootloader.grub2:bootloader.py: used boot args: rhgb quiet
org.fedoraproject.Anaconda.Modules.Storage:INFO:program:Running in chroot '/mnt/sysroot'... grub2-editenv - set menu_auto_hide=1 boot_success=1
org.fedoraproject.Anaconda.Modules.Storage:INFO:program:grub2-editenv: error: cannot open `/boot/grub2/grubenv.new': No such file or directory.
org.fedoraproject.Anaconda.Modules.Storage:DEBUG:program:Return code: 1
```

See: https://pagure.io/workstation-ostree-config/pull-request/330

This reverts commit 819da5c8ec.
2023-07-26 18:17:27 +02:00
Timothée Ravier
819da5c8ec Enable bootupd integration now that we use unified core
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueBootupd
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore

Revert "Disable bootupd integration until we use unified core"
This reverts commit a1a8bbe8bb.
2023-07-25 16:20:41 +02:00
Timothée Ravier
cb24c527ed fedora-common-ostree: Exclude dnf dependencies
Make sure to always exclude dnf, even when pulled in as a dependency.
2023-07-04 10:35:44 +02:00
Timothée Ravier
32d3823b99 fedora-common-ostree: Add workaround for nfs-client.target
See: https://bugzilla.redhat.com/show_bug.cgi?id=2218006
2023-06-30 16:08:13 +02:00
Timothée Ravier
fa59f1ec28 fedora-common-ostree: Make presets canonical
This ensures that only services defined in presets are enabled by
default. This has two advantages:
- services enabed in RPM scriptlets are dropped
- new services can be enabled by default simply by adding them to
  presets

This mirrors the behaviour of Fedora CoreOS. For more informations, see:
- https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/ignition-and-ostree.yaml#L39..L48
- https://github.com/coreos/fedora-coreos-config/pull/73
- https://github.com/coreos/fedora-coreos-config/pull/77
- https://github.com/coreos/fedora-coreos-config/pull/122
- https://github.com/coreos/rpm-ostree/issues/1803
2023-06-30 16:00:14 +02:00
Colin Walters
d4a27985fa fedora-common-ostree: Default to bash
That said, maybe someone wants to do something else for these
images, but this is kind of the lowest common denominator...

Part of https://pagure.io/releng/issue/11324
2023-03-13 17:03:12 -04:00
Timothée Ravier
9dc9105ddb fedora-common-ostree: Workaround for unified-core mode change
Remove the `loader` directory that conflicts with the `loader` symlink
that is installed by Anaconda.

See: https://pagure.io/pungi-fedora/pull-request/1115
See: fa42c8b425/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py (L307)
2023-02-12 13:54:37 +01:00
Timothée Ravier
636bb97493 Rawhide is now Fedora 39 2023-02-10 15:21:30 +01:00
Timothée Ravier
18f3fdf975 Update comments about package inclusion 2023-01-24 10:25:42 +01:00
Timothée Ravier
66eef7a634 common: Add git-core-doc
Do not include "full" Git as it brings in Perl.
Explicitely add Git docs.

Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/387
2022-11-22 12:49:09 +01:00
Adam Williamson
6a689cc380 Drop some now-unneeded manual handling of arch-specific packages
This lets the recently-merged improved arch-specific package
support handle all the arch-specific packages which were
previously excluded in `comps-sync-exclude-list.yml` and listed
manually in `fedora-common-ostree.yaml`. As the diff shows,
the sync script now correctly includes the same packages for
the same arches in `fedora-common-ostree-pkgs.yaml`, plus a few
appropriate additions of things that should be there but had
been left out, on ppc64le and aarch64.

We also drop the `packages-armhfp` and `packages-ppc64` lists,
as we no longer build for either of those arches. This allows
us to move `ostree-grub2` into the non-arch-specific list, since
it's no longer left out on any arch we care about.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2022-11-09 19:10:17 +00:00
Colin Walters
a1a8bbe8bb Disable bootupd integration until we use unified core
The bootupd code relies on having `/usr/lib/ostree-boot`, which
we only get in unified core mode.
2022-11-02 20:12:58 +00:00
Colin Walters
43a47ea209 Add bootupd integration
This does what we should have done originally, and copies the
bootupd bits directly from
https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml

And uses them via includes.
2022-10-16 15:54:15 -04:00
Timothée Ravier
30894f26a5 common: Move sysroot RO script to postprocess-script
Bash Heredoc in inline YAML string is tricky. Use an independent
post-process script instead.

Fixes: 5bbc140 Revert "Revert "common: Add readonly sysroot migration unit and script""
2022-08-19 21:46:21 +02:00
Timothée Ravier
1515900d35 common: Move bootupd to arch specific package list
We only have bootup for x86 & aarch64.

Fixes: d34e2ee common: add bootupd
2022-08-19 15:28:18 +02:00
Timothée Ravier
5bbc140133 Revert "Revert "common: Add readonly sysroot migration unit and script""
Updated to fix indentation/syntax issue

This reverts commit 30f2880cfc.
2022-08-19 11:35:46 +02:00
Kevin Fenzi
30f2880cfc Revert "common: Add readonly sysroot migration unit and script"
This reverts commit b87ec3ccd0.
2022-08-16 08:33:17 -07:00
Jonathan Lebon
d34e2ee500 common: add bootupd
We need to make it easier to update the bootloader on these variants
because unlike on traditional systems, it's not updated automatically
with the rest of the system. Add bootupd for that.

This would allow fixing issues like:
- https://github.com/coreos/rpm-ostree/issues/3715
- https://github.com/fedora-silverblue/issue-tracker/issues/120#issuecomment-979268679

It won't be enabled by default and as mentioned in that comment requires
work in Anaconda to be seamless. But at least with this users should be
able to adopt and update:

https://github.com/coreos/bootupd/blob/main/README-design.md

See also the tracker issue where we did this for Fedora CoreOS:

https://github.com/coreos/fedora-coreos-tracker/issues/510
2022-08-11 17:32:38 -04:00
b1d4141d14 Rawhide is now f38
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-08-09 14:16:14 +02:00
Timothée Ravier
b87ec3ccd0 common: Add readonly sysroot migration unit and script
Add unit and corresponding script to migrate existing systems to read
only sysroot.

See: https://fedoraproject.org/wiki/Changes/Silverblue_Kinoite_readonly_sysroot
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=2060976
2022-08-08 17:40:01 +02:00
Timothée Ravier
1628cb19bf fedora-common-ostree: Add ncurses
Provides terminal tools like clear, reset, tput, and tset

Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/253
2022-04-20 13:29:38 +02:00
Allison Karlitskaya
88f5c3b25c Revert "Add minimal -devel packages as needed to build kernel modules"
This reverts commit 31ad6acced.

With the addition of the fedora-updates-archive repository to fedora-repos, our
concern about not being able to find the correct -devel packages to install
have disappeared.  Additionally, the kernel now ships -matched versions
of its packages (to allow matching headers to the main kernel package)
and akmods depends on the matched package, which means that we are sure
to get the package we need.

See also: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1195
See also: https://src.fedoraproject.org/rpms/akmods/pull-request/3
2022-02-16 17:40:15 +00:00
ecbfb4339c Rawhide is now f37
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-02-08 14:02:58 +01:00
Timothée Ravier
eb48de275c fedora-common-ostree: Move post script inline
This was difficult with the JSON based manifests but is now easy with
the YAML ones.
2022-01-21 11:32:12 +01:00
Timothée Ravier
167a5f0097 fedora-common-ostree: Minor cosmetic fix 2021-11-15 20:12:06 +01:00
Timothée Ravier
d82eefe7c3 Revert "Use sqlite instead of bdb for rpmdb"
This is now the default for rpm-ostree in F34+.

This reverts commit a2743ec5de.
2021-08-19 20:09:48 +02:00