Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-08-16 01:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

feat: bump Fedora version

Browse source 
Fixes: https://github.com/ben-grande/qusal/issues/139
This commit is contained in:
Ben Grande 2025-07-27 20:09:03 +02:00
parent 93ebe4c77f
commit d9b55248fb
No known key found for this signature in database
GPG key ID: 00C64E14F51F9E56
6 changed files with 43 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
salt/fedora-minimal/README.md
View file

@ -19,7 +19,7 @@ it.
```sh
sudo qubesctl top.enable fedora-minimal
sudo qubesctl --targets=fedora-41-minimal state.apply
sudo qubesctl --targets=fedora-42-minimal state.apply
sudo qubesctl top.disable fedora-minimal
sudo qubesctl state.apply fedora-minimal.prefs
```
@ -30,7 +30,7 @@ sudo qubesctl state.apply fedora-minimal.prefs
```sh
sudo qubesctl state.apply fedora-minimal.create
sudo qubesctl --skip-dom0 --targets=fedora-41-minimal state.apply fedora-minimal.install
sudo qubesctl --skip-dom0 --targets=fedora-42-minimal state.apply fedora-minimal.install
sudo qubesctl state.apply fedora-minimal.prefs
```

4
salt/fedora-xfce/README.md
View file

@ -18,7 +18,7 @@ Creates the Fedora Xfce template as well as a Disposable Template based on it.
```sh
sudo qubesctl top.enable fedora-xfce
sudo qubesctl --targets=fedora-41-xfce state.apply
sudo qubesctl --targets=fedora-42-xfce state.apply
sudo qubesctl top.disable fedora-xfce
sudo qubesctl state.apply fedora-xfce.prefs
```
@ -29,7 +29,7 @@ sudo qubesctl state.apply fedora-xfce.prefs
```sh
sudo qubesctl state.apply fedora-xfce.create
sudo qubesctl --skip-dom0 --targets=fedora-41-xfce state.apply fedora-xfce.install
sudo qubesctl --skip-dom0 --targets=fedora-42-xfce state.apply fedora-xfce.install
sudo qubesctl state.apply fedora-xfce.prefs
```

4
salt/fedora/README.md
View file

@ -18,7 +18,7 @@ Creates the Fedora template as well as a Disposable Template based on it.
```sh
sudo qubesctl top.enable fedora
sudo qubesctl --targets=fedora-41 state.apply
sudo qubesctl --targets=fedora-42 state.apply
sudo qubesctl top.disable fedora
sudo qubesctl state.apply fedora.prefs
```
@ -29,7 +29,7 @@ sudo qubesctl state.apply fedora.prefs
```sh
sudo qubesctl state.apply fedora.create
sudo qubesctl --skip-dom0 --targets=fedora-41 state.apply fedora.install
sudo qubesctl --skip-dom0 --targets=fedora-42 state.apply fedora.install
sudo qubesctl state.apply fedora.prefs
```

2
salt/fedora/template.jinja
View file

@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% set base = 'fedora' -%}
{% set version = salt['pillar.get']('qvm:fedora:version', '41') -%}
{% set version = salt['pillar.get']('qvm:fedora:version', '42') -%}
{% set flavor = '' -%}
{% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%}
{% if flavor -%}

7
salt/sys-pgp/install.sls
View file

@ -22,15 +22,14 @@ include:
- gnupg2
- man-db
{# TODO: sequoia-wot can't be installed on fedora-41 #}
{# TODO: sequoia-wot and sequoia-keyring-linter can't be installed on fedora-42 #}
{% set pkg = {
'Debian': {
'pkg': ['sq', 'sq-keyring-linter', 'sq-wot', 'sqop', 'sqv'],
},
'RedHat': {
'pkg': ['sequoia-sq', 'sequoia-keyring-linter', 'sequoia-sop',
'sequoia-sqv', 'sequoia-policy-config',
'sequoia-chameleon-gnupg'],
'pkg': ['sequoia-sq', 'sequoia-sop', 'sequoia-sqv',
'sequoia-policy-config', 'sequoia-chameleon-gnupg'],
},
}.get(grains.os_family) -%}

33
scripts/version-update.sh Executable file
View file

@ -0,0 +1,33 @@
#!/bin/sh
## SPDX-FileCopyrightText: 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
##
## SPDX-License-Identifier: AGPL-3.0-or-later
set -eu
usage(){
printf '%s\n' "Usage: ${0##*/} TEMPLATE OLD_VERSION NEW_VERSION
Example: ${0##*/} fedora 41 42" >&2
exit 1
}
case "${1-}" in
""|-h|--?help) usage;;
*) ;;
esac
command -v git >/dev/null ||
{ printf '%s\n' "Missing program: git" >&2; exit 1; }
repo_toplevel="$(git rev-parse --show-toplevel)"
test -d "${repo_toplevel}" || exit 1
cd "${repo_toplevel}"
unset repo_toplevel
template="${1}"
old_version="${2}"
new_version="${3}"
sed -i "s/${old_version}/${new_version}/" salt/"${template}"*/template.jinja
sed -i "s/${template}-${old_version}/${template}-${new_version}/" \
salt/"${template}"*/README.md