vladan
/
workstation-ostree-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
workstation-ostree-config/fedora-common-ostree.yaml

89 lines
2.0 KiB
YAML
Raw Normal View History

Fix Rawhide -> F34 branching
2021-02-19 10:54:35 +01:00
ref: fedora/34/${basearch}/ostree-base
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
Rawhide is now f36 Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2021-08-10 14:23:18 +02:00
automatic_version_prefix: "36"
mutate-os-release: "36"
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
packages:
- git-core
- rpm-ostree
Add some minor comments
2019-04-06 19:04:22 +02:00
# Container management
- buildah
- podman
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
- skopeo
- toolbox
selinux: true
documentation: true
fedora-common-ostree: Switch to modules for boot-location Fixes the following warning: warning: boot-location: "new" is deprecated, use boot-location: modules From the rpm-ostree docs (https://coreos.github.io/rpm-ostree/treefile/): - “new”: A misnomer, this value is no longer “new”. Kernel data goes in /usr/lib/ostree-boot in addition to /usr/lib/modules. This is the default; use it if you have a need to care about upgrading from very old versions of libostree. - “modules”: Kernel data goes just in /usr/lib/modules. Use this for new systems, and systems that don’t need to be upgraded from very old libostree versions.
2020-11-27 15:29:12 +01:00
boot-location: modules
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
etc-group-members:
- wheel
tmp-is-dir: true
ignore-removed-users:
- root
ignore-removed-groups:
- root
fedora-common-ostree: Minor cosmetic fix
2021-10-11 13:06:47 +02:00
check-passwd:
type: file
filename: passwd
check-groups:
type: file
filename: group
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
default_target: graphical.target
# Keep this in sync with fedora-atomic-host.json from fedora-atomic
packages-aarch64:
- grub2-efi
- ostree-grub2
- efibootmgr
- shim
packages-armhfp:
- extlinux-bootloader
Move xorg-x11-drv-armada to armhfp-only packages
2020-02-12 18:06:06 +01:00
- xorg-x11-drv-armada
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
packages-ppc64:
- grub2
- ostree-grub2
packages-ppc64le:
- grub2
- ostree-grub2
packages-x86_64:
Include shim and grub2 packages for 32-bit EFI firmware https://pagure.io/workstation-ostree-config/issue/217
2021-05-17 10:58:58 +02:00
- grub2-efi-ia32
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
- grub2-efi-x64
Explicitly include grub2-pc instead of grub2 This makes the listing more explicit but shouldn't change the package set as grub2-pc provides grub2.
2021-05-17 11:21:32 +02:00
- grub2-pc
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
- ostree-grub2
- efibootmgr
Include shim and grub2 packages for 32-bit EFI firmware https://pagure.io/workstation-ostree-config/issue/217
2021-05-17 10:58:58 +02:00
- shim-ia32
- shim-x64
Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi
2019-04-06 18:38:45 +02:00
- microcode_ctl
Blacklist x86_64 specific packages and make them arch specific Signed-off-by: dftxbs3e <dftxbs3e@free.fr>
2019-05-07 20:39:27 +02:00
- mcelog
thermald is x86_64 only As with mcelog and microcode_ctl, add it to the blocklist and list it manually in packages-x86_64 in fedora-common-ostree.yaml instead. This should fix non-x86_64 arches which are failing because they can't find it. Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-09-18 01:14:52 +02:00
- thermald
Exclude PackageKit Now that rpm-ostree supports exclude-packages in treefile, we can finally exclude PackageKit (it's Recommended by gnome-software, but nothing hard-requires it).
2020-02-12 16:21:13 +01:00
# Make sure the following are not pulled in when Recommended by other packages
exclude-packages:
- PackageKit
Make sure all openh264 packages are always excluded According to https://fedoraproject.org/wiki/OpenH264, we can not ship this in Silverblue.
2021-02-02 12:42:14 +01:00
# We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
- gstreamer1-plugin-openh264
- mozilla-openh264
- openh264
fedora-common-ostree: Move post script inline This was difficult with the JSON based manifests but is now easy with the YAML ones.
2021-10-09 16:31:03 +02:00
postprocess:
- |
#!/usr/bin/env bash
set -xeuo pipefail
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
# From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf
install -dm0755 /usr/lib/systemd/journald.conf.d/
echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf
# See: https://src.fedoraproject.org/rpms/glibc/pull-request/4
# Basically that program handles deleting old shared library directories
# mid-transaction, which never applies to rpm-ostree. This is structured as a
# loop/glob to avoid hardcoding (or trying to match) the architecture.
for x in /usr/sbin/glibc_post_upgrade.*; do
if test -f ${x}; then
ln -srf /usr/bin/true ${x}
fi
done