From 9221707e6784d9a31270ee7b89592b12588635d9 Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 5 Jun 2024 00:04:31 -0700 Subject: [PATCH 1/4] fix: make flags consistent across codebase and remove faulty flags --- katsu/modules/base/base-disk-aarch64.yaml | 2 -- katsu/modules/base/base-disk-x86_64.yaml | 2 -- katsu/modules/base/base-disk.yaml | 3 ++- katsu/modules/base/base-docker.yaml | 3 ++- katsu/modules/base/base.yaml | 3 --- katsu/modules/chromebook/base-cbe-kernel.yaml | 5 ++--- katsu/modules/chromebook/base-cbe-mt8183.yaml | 5 ++--- katsu/modules/chromebook/base-cbe-mt8192.yaml | 5 ++--- katsu/modules/chromebook/base-cbe-sc7180.yaml | 5 ++--- katsu/modules/chromebook/base-cbe-stoneyridge.yaml | 5 ++--- katsu/modules/chromebook/base-cbe.yaml | 5 ++--- katsu/modules/flagship/flagship.yaml | 2 -- katsu/modules/gnome/gnome-chromebook-mt8192.yaml | 2 -- katsu/modules/gnome/gnome-live.yaml | 7 ------- katsu/modules/gnome/gnome.yaml | 2 -- katsu/modules/kde/kde.yaml | 4 ---- katsu/modules/pantheon/pantheon.yaml | 2 -- katsu/modules/xfce/xfce.yaml | 2 -- 18 files changed, 16 insertions(+), 48 deletions(-) diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml index 086300bc..34ff1d3a 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 2e1aab17..01cbe186 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 b6664ecf..6080c201 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 05d11377..3fa431cb 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= + - --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 7de5cf7e..0e1b94ba 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 da3c1102..304e2748 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 da3c1102..304e2748 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 da3c1102..304e2748 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 da3c1102..304e2748 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 da3c1102..304e2748 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 79229ce6..1473a8fd 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 a0de9f1f..a6a6e253 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 8044eff6..c78ad734 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 7e88f734..4e506f14 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 fd2f8f4d..126eaef8 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 4fa2ecdf..9b624b71 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 591bc858..a1168939 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 58f536d0..ad18b98d 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??? From 45e23694e24f3f846e1d42b21a52f150c670a683 Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 5 Jun 2024 01:20:13 -0700 Subject: [PATCH 2/4] fix: set tsflags for docker to nodocs --- katsu/modules/base/base-docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/katsu/modules/base/base-docker.yaml b/katsu/modules/base/base-docker.yaml index 3fa431cb..32b417e3 100644 --- a/katsu/modules/base/base-docker.yaml +++ b/katsu/modules/base/base-docker.yaml @@ -6,7 +6,7 @@ dnf: options: - --setopt=cachedir=/var/cache/dnf - --setopt=keepcache=True - - --setopt=tsflags= + - --setopt=tsflags=nodocs - --setopt=max_parallel_downloads=20 exclude: - fedora-release* From eb2c4c1b724dc687c0c852cc1afdb946da407e6c Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 5 Jun 2024 01:20:26 -0700 Subject: [PATCH 3/4] fix: install rpmfusion release within build container --- .github/workflows/build-katsu.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml index 0981396f..2778f8e6 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-$(rpm -E %fedora).noarch.rpm + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm on: push: From 7ced463aef8845706ca63dfb9911cb4d8c4b1978 Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 5 Jun 2024 01:22:14 -0700 Subject: [PATCH 4/4] fix: rpmfusion package paths --- .github/workflows/build-docker.yml | 2 ++ .github/workflows/build-katsu.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 0782a49b..5f9815ac 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 2778f8e6..50a711f5 100644 --- a/.github/workflows/build-katsu.yml +++ b/.github/workflows/build-katsu.yml @@ -38,8 +38,8 @@ env: podman buildah katsu - https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm - https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm + 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: