diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 0782a49..5f9815a 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -37,6 +37,8 @@ env: podman buildah katsu + https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-40.noarch.rpm on: push: diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 0981396..50a711f 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -38,6 +38,8 @@ env: podman buildah katsu + https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-40.noarch.rpm on: push: diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml index 086300b..34ff1d3 100644 --- a/katsu/modules/base/base-disk-aarch64.yaml +++ b/katsu/modules/base/base-disk-aarch64.yaml @@ -14,8 +14,6 @@ import: dnf: releasever: 40 - # options: - # - --setopt=strict=0 arch: aarch64 packages: - ultramarine-release-identity-basic diff --git a/katsu/modules/base/base-disk-x86_64.yaml b/katsu/modules/base/base-disk-x86_64.yaml index 2e1aab1..01cbe18 100644 --- a/katsu/modules/base/base-disk-x86_64.yaml +++ b/katsu/modules/base/base-disk-x86_64.yaml @@ -14,8 +14,6 @@ import: dnf: releasever: 40 - # options: - # - --setopt=strict=0 packages: - ultramarine-release-identity-basic - ultramarine-release-basic diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml index b6664ec..6080c20 100644 --- a/katsu/modules/base/base-disk.yaml +++ b/katsu/modules/base/base-disk.yaml @@ -10,8 +10,9 @@ dnf: releasever: 40 options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/base/base-docker.yaml b/katsu/modules/base/base-docker.yaml index 05d1137..32b417e 100644 --- a/katsu/modules/base/base-docker.yaml +++ b/katsu/modules/base/base-docker.yaml @@ -5,8 +5,9 @@ dnf: releasever: 40 options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True + - --setopt=tsflags=nodocs + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml index 7de5cf7..0e1b94b 100644 --- a/katsu/modules/base/base.yaml +++ b/katsu/modules/base/base.yaml @@ -17,10 +17,7 @@ dnf: repodir: repodir options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing - --setopt=tsflags= - --setopt=max_parallel_downloads=20 exclude: diff --git a/katsu/modules/chromebook/base-cbe-kernel.yaml b/katsu/modules/chromebook/base-cbe-kernel.yaml index da3c110..304e274 100644 --- a/katsu/modules/chromebook/base-cbe-kernel.yaml +++ b/katsu/modules/chromebook/base-cbe-kernel.yaml @@ -18,10 +18,9 @@ dnf: repodir: ./repodir-mtest options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/chromebook/base-cbe-mt8183.yaml b/katsu/modules/chromebook/base-cbe-mt8183.yaml index da3c110..304e274 100644 --- a/katsu/modules/chromebook/base-cbe-mt8183.yaml +++ b/katsu/modules/chromebook/base-cbe-mt8183.yaml @@ -18,10 +18,9 @@ dnf: repodir: ./repodir-mtest options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/chromebook/base-cbe-mt8192.yaml b/katsu/modules/chromebook/base-cbe-mt8192.yaml index da3c110..304e274 100644 --- a/katsu/modules/chromebook/base-cbe-mt8192.yaml +++ b/katsu/modules/chromebook/base-cbe-mt8192.yaml @@ -18,10 +18,9 @@ dnf: repodir: ./repodir-mtest options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/chromebook/base-cbe-sc7180.yaml b/katsu/modules/chromebook/base-cbe-sc7180.yaml index da3c110..304e274 100644 --- a/katsu/modules/chromebook/base-cbe-sc7180.yaml +++ b/katsu/modules/chromebook/base-cbe-sc7180.yaml @@ -18,10 +18,9 @@ dnf: repodir: ./repodir-mtest options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/chromebook/base-cbe-stoneyridge.yaml b/katsu/modules/chromebook/base-cbe-stoneyridge.yaml index da3c110..304e274 100644 --- a/katsu/modules/chromebook/base-cbe-stoneyridge.yaml +++ b/katsu/modules/chromebook/base-cbe-stoneyridge.yaml @@ -18,10 +18,9 @@ dnf: repodir: ./repodir-mtest options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/chromebook/base-cbe.yaml b/katsu/modules/chromebook/base-cbe.yaml index 79229ce..1473a8f 100644 --- a/katsu/modules/chromebook/base-cbe.yaml +++ b/katsu/modules/chromebook/base-cbe.yaml @@ -18,10 +18,9 @@ dnf: repodir: ../base/repodir options: - --setopt=cachedir=/var/cache/dnf - - --nogpgcheck - --setopt=keepcache=True - - --best - - --allowerasing + - --setopt=tsflags= + - --setopt=max_parallel_downloads=20 exclude: - fedora-release* - generic-release* diff --git a/katsu/modules/flagship/flagship.yaml b/katsu/modules/flagship/flagship.yaml index a0de9f1..a6a6e25 100644 --- a/katsu/modules/flagship/flagship.yaml +++ b/katsu/modules/flagship/flagship.yaml @@ -6,8 +6,6 @@ scripts: dnf: releasever: 40 - # options: - # - --setopt=strict=0 exclude: - budgie-desktop-defaults - budgie-backgrounds diff --git a/katsu/modules/gnome/gnome-chromebook-mt8192.yaml b/katsu/modules/gnome/gnome-chromebook-mt8192.yaml index 8044eff..c78ad73 100644 --- a/katsu/modules/gnome/gnome-chromebook-mt8192.yaml +++ b/katsu/modules/gnome/gnome-chromebook-mt8192.yaml @@ -21,8 +21,6 @@ kernel_cmdline: "quiet rhgb" dnf: releasever: 40 - # options: - # - --setopt=strict=0 packages: - "@ultramarine-gnome-product-environment" - ultramarine-release-gnome diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml index 7e88f73..4e506f1 100644 --- a/katsu/modules/gnome/gnome-live.yaml +++ b/katsu/modules/gnome/gnome-live.yaml @@ -23,11 +23,4 @@ scripts: file: gnome-live.sh dnf: - options: - - --setopt='--tsflags=' # possibly fix #6 by blanking out the tsflags so docs are installed - - -d2 #debug - - --setopt=install_weak_deps=False - - --setopt=cachedir=/var/cache/dnf - - --setopt=keepcache=True - - --best releasever: 40 diff --git a/katsu/modules/gnome/gnome.yaml b/katsu/modules/gnome/gnome.yaml index fd2f8f4..126eaef 100644 --- a/katsu/modules/gnome/gnome.yaml +++ b/katsu/modules/gnome/gnome.yaml @@ -1,7 +1,5 @@ dnf: releasever: 40 - # options: - # - --setopt=strict=0 packages: - "@ultramarine-gnome-product-environment" - ultramarine-release-gnome diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml index 4fa2ecd..9b624b7 100644 --- a/katsu/modules/kde/kde.yaml +++ b/katsu/modules/kde/kde.yaml @@ -1,9 +1,5 @@ dnf: releasever: 40 - # options: - # - --setopt=strict=0 - #exclude: - #- packages: #beta - still need to set up our own comps - "@ultramarine-kde-product-environment" diff --git a/katsu/modules/pantheon/pantheon.yaml b/katsu/modules/pantheon/pantheon.yaml index 591bc85..a116893 100644 --- a/katsu/modules/pantheon/pantheon.yaml +++ b/katsu/modules/pantheon/pantheon.yaml @@ -2,8 +2,6 @@ builder: dnf dnf: releasever: 40 - options: - - --setopt=strict=1 exclude: - gnome-tour - gnome-shell diff --git a/katsu/modules/xfce/xfce.yaml b/katsu/modules/xfce/xfce.yaml index 58f536d..ad18b98 100644 --- a/katsu/modules/xfce/xfce.yaml +++ b/katsu/modules/xfce/xfce.yaml @@ -6,8 +6,6 @@ scripts: dnf: releasever: 40 - # options: - # - --setopt=strict=0 exclude: - ultramarine-backgrounds-compat - "dnfdragora*" # Jade doesn't like this for some reason???