From 9a844270151d247b8a1e86049cb0295195253d01 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 13 2025 21:18:44 +0000 Subject: [PATCH 1/3] REUSE: Misc changes to be REUSE compliant --- diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7f8f94e..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 0000000..d817195 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,18 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO +EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..562532a --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,17 @@ +version = 1 + +[[annotations]] +path = [ + "*.repo", + "*.yaml", + ".gitignore", + "README.md", + "ci/*", + "comps-sync-exclude-list.yml", + "group", + "passwd", +] +SPDX-FileCopyrightText = [ + "Fedora Atomic Desktops maintainers", +] +SPDX-License-Identifier = "MIT" diff --git a/comps-sync.py b/comps-sync.py index 67a77f9..e2faa2d 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: Fedora Atomic Desktops maintainers +# SPDX-License-Identifier: MIT + ''' Usage: ./comps-sync.py [--save] /path/to/comps-f43.xml.in diff --git a/generate-gitlab-ci.sh b/generate-gitlab-ci.sh index aee2d2d..90da804 100755 --- a/generate-gitlab-ci.sh +++ b/generate-gitlab-ci.sh @@ -1,4 +1,6 @@ #!/bin/bash + +# SPDX-FileCopyrightText: Fedora Atomic Desktops maintainers # SPDX-License-Identifier: MIT set -euo pipefail @@ -24,6 +26,7 @@ fi { cat < Date: Oct 13 2025 21:18:44 +0000 Subject: [PATCH 2/3] fedora: Enable fedora-third-party-refresh unit Enable the fedora-third-party-refresh.service unit to make sure that Fedora Third Party repos configuration updates are applied after updates, on boot. On package mode systems, updates to the Fedora Third Party configuration and repos are triggered on package updates & changes using scriplets and tansfiletriggerin triggers. None of those will apply to Atomic Desktops thus this service unit was created, but never enabled. We need this enabled to make sure that the Google Chrome repo (disabled in the following commit) is disabled on rebase to Fedora 43, before any package layering operation is triggered. --- diff --git a/bootupd.yaml b/bootupd.yaml index 4f49b5e..68b7829 100644 --- a/bootupd.yaml +++ b/bootupd.yaml @@ -19,7 +19,7 @@ postprocess: ExecStart=/usr/bin/bootupctl migrate-static-grub-config EOF - echo "enable bootloader-update.service" > /usr/lib/systemd/system-preset/81-atomic-desktop.preset + echo "enable bootloader-update.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset # Turn permissive mode on for bootupd until all SELinux issues are fixed semanage permissive --noreload --add bootupd_t diff --git a/common.yaml b/common.yaml index 88cac8a..5804829 100644 --- a/common.yaml +++ b/common.yaml @@ -25,6 +25,8 @@ include: - kernel-install.yaml # Enable composefs - composefs.yaml + # Fixes for Fedora Third Party + - fedora.yaml arch-include: x86_64: diff --git a/fedora.yaml b/fedora.yaml new file mode 100644 index 0000000..7630924 --- /dev/null +++ b/fedora.yaml @@ -0,0 +1,8 @@ +# Enable the fedora-third-party-refresh.service unit that was meant for Atomic +# Desktops but never got enabled. +postprocess: + - | + #!/bin/bash + set -xeuo pipefail + + echo "enable fedora-third-party-refresh.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset From a044b014311d3ffc65ee61843785951f7a670b3c Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 13 2025 21:18:44 +0000 Subject: [PATCH 3/3] fedora: Skip Google Chrome RPM repo in Fedora Third Party Skip enabling this repo as it currently creates issues with package layering. Workaroud for: https://github.com/coreos/rpm-ostree/issues/5494 --- diff --git a/fedora.yaml b/fedora.yaml index 7630924..de81bff 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -1,8 +1,12 @@ # Enable the fedora-third-party-refresh.service unit that was meant for Atomic # Desktops but never got enabled. +# Remove the Google Chrome repo from the list of Fedora Third Party enabled +# repos. Workaround for https://github.com/coreos/rpm-ostree/issues/5494 postprocess: - | #!/bin/bash set -xeuo pipefail echo "enable fedora-third-party-refresh.service" >> /usr/lib/systemd/system-preset/81-atomic-desktop.preset + + sed -i -e '/google-chrome/,+2d' /usr/lib/fedora-third-party/conf.d/fedora-workstation.conf