From 505bd27538aa84ab76afce774b03a039f59e7479 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 22 Oct 2023 07:21:42 +0700 Subject: [PATCH 1/4] funnies --- katsu/modules/flagship/budgie.yaml | 24 ++++++++---------------- katsu/modules/flagship/flagship-live.sh | 2 +- katsu/modules/liveimage/live.sh | 4 ++-- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/katsu/modules/flagship/budgie.yaml b/katsu/modules/flagship/budgie.yaml index 721a78a..35c4fb6 100644 --- a/katsu/modules/flagship/budgie.yaml +++ b/katsu/modules/flagship/budgie.yaml @@ -9,27 +9,24 @@ dnf: - gdm - budgie-desktop-defaults - nautilus + - papirus-icon-theme - gnome-shell + - materia-gtk-theme packages: - - manrope-fonts + - "@ultramarine-flagship-product-environment" + - "@libreoffice" + - "@input-methods" + - "@core" + - "@multimedia" + - "@fonts" - nemo - nemo-fileroller - nemo-extensions - nemo-preview - nemo-emblems - - "@ultramarine-flagship-product" - - "@base-x" - - "@core" - - "@libreoffice" - bind-utils - psmisc - fuse - - "@input-methods" - - "@multimedia" - - "@fonts" - - "@budgie-desktop" - # - "@flagship-product-environment" - - "@budgie-desktop-apps" - policycoreutils - coreutils - gnome-software @@ -51,12 +48,7 @@ dnf: - xdg-user-dirs-gtk - python3-psutil - fluent-theme - - fluent-icon-theme - ultramarine-release-identity-flagship - ultramarine-backgrounds-gnome - ultramarine-backgrounds-basic - - budgie-desktop - - budgie-extras - - budgie-extras-daemon - - budgie-desktop-view - ultramarine-flagship-filesystem diff --git a/katsu/modules/flagship/flagship-live.sh b/katsu/modules/flagship/flagship-live.sh index d0ae0cd..e1503eb 100644 --- a/katsu/modules/flagship/flagship-live.sh +++ b/katsu/modules/flagship/flagship-live.sh @@ -58,6 +58,6 @@ cp /etc/lightdm/lightdm.conf.d/50-ultramarine-lightdm-gtk-greeter.conf /etc/ligh # Reinstall anaconda-core and anaconda-live to make sure we fix any localization issues -dnf reinstall -y anaconda-core +# dnf reinstall -y anaconda-core dnf clean all diff --git a/katsu/modules/liveimage/live.sh b/katsu/modules/liveimage/live.sh index fc82c0b..b499f12 100644 --- a/katsu/modules/liveimage/live.sh +++ b/katsu/modules/liveimage/live.sh @@ -14,11 +14,11 @@ vartmp /var/tmp tmpfs defaults 0 0 EOF # work around for poor key import UI in PackageKit -rm -f /var/lib/rpm/__db* +# rm -f /var/lib/rpm/__db* echo "Packages within this LiveCD" rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn # Note that running rpm recreates the rpm db files which aren't needed or wanted -rm -f /var/lib/rpm/__db* +# rm -f /var/lib/rpm/__db* # go ahead and pre-make the man -k cache (#455968) From 1756a1a8eab44fd0917800a61a930bd8a7317f57 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 22 Oct 2023 07:52:32 +0700 Subject: [PATCH 2/4] add buildstamp script, funny stuff --- katsu/modules/base/base.yaml | 3 +++ katsu/modules/base/buildstamp.sh | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 katsu/modules/base/buildstamp.sh diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml index e71db3c..73616c0 100644 --- a/katsu/modules/base/base.yaml +++ b/katsu/modules/base/base.yaml @@ -6,6 +6,9 @@ scripts: - id: selinux-setup name: Set up SELinux file: selinux.sh + - id: buildstamp + name: Generate buildstamp + file: buildstamp.sh dnf: releasever: 39 diff --git a/katsu/modules/base/buildstamp.sh b/katsu/modules/base/buildstamp.sh new file mode 100644 index 0000000..cd14181 --- /dev/null +++ b/katsu/modules/base/buildstamp.sh @@ -0,0 +1,24 @@ +#!/bin/bash -x + +# get data from /etc/os-release + +source /etc/os-release + + +# get date in form of example 202112022224 +DATE=$(date +%Y%m%d%H%M) + +UUID="${DATE}.$(uname -m)" + +# Inject a dummy .buildstamp so Anaconda doesn't complain +cat << EOF > /.buildstamp +[Main] +Product=${NAME} +Version=${VERSION} +BugURL=${BUG_REPORT_URL} +IsFinal=true +UUID=$UUID +Variant=${VARIANT_ID} +[Compose] +Katsu=0.1 +EOF From 37feadefaea7d6d2d2d271596d99917a4e534b0a Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 22 Oct 2023 14:29:59 +0700 Subject: [PATCH 3/4] funny --- katsu/modules/base/base.yaml | 1 + katsu/modules/base/desktop/desktop.yaml | 3 +-- katsu/modules/flagship/budgie.yaml | 8 +------- katsu/modules/liveimage/liveimage.yaml | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml index 73616c0..238ace7 100644 --- a/katsu/modules/base/base.yaml +++ b/katsu/modules/base/base.yaml @@ -22,6 +22,7 @@ dnf: exclude: - fedora-release* - generic-release* + - kernel-debug* packages: - filesystem - setup diff --git a/katsu/modules/base/desktop/desktop.yaml b/katsu/modules/base/desktop/desktop.yaml index 27c5631..8c4d437 100644 --- a/katsu/modules/base/desktop/desktop.yaml +++ b/katsu/modules/base/desktop/desktop.yaml @@ -11,9 +11,8 @@ dnf: releasever: 39 exclude: - google-noto-sans-mono-cjk-vf-fonts - - default-fonts-cjk-sans - - default-fonts-cjk-mono - fedora-bookmarks + - google-noto-sans-mono-cjk-vf-fonts packages: - "@base-x" - "@core" diff --git a/katsu/modules/flagship/budgie.yaml b/katsu/modules/flagship/budgie.yaml index 35c4fb6..5b8db10 100644 --- a/katsu/modules/flagship/budgie.yaml +++ b/katsu/modules/flagship/budgie.yaml @@ -9,9 +9,7 @@ dnf: - gdm - budgie-desktop-defaults - nautilus - - papirus-icon-theme - gnome-shell - - materia-gtk-theme packages: - "@ultramarine-flagship-product-environment" - "@libreoffice" @@ -47,8 +45,4 @@ dnf: - xdg-desktop-portal-gtk - xdg-user-dirs-gtk - python3-psutil - - fluent-theme - - ultramarine-release-identity-flagship - - ultramarine-backgrounds-gnome - - ultramarine-backgrounds-basic - - ultramarine-flagship-filesystem + - fluent-theme \ No newline at end of file diff --git a/katsu/modules/liveimage/liveimage.yaml b/katsu/modules/liveimage/liveimage.yaml index 104e3f4..751d48a 100644 --- a/katsu/modules/liveimage/liveimage.yaml +++ b/katsu/modules/liveimage/liveimage.yaml @@ -28,7 +28,7 @@ dnf: - espeak-ng - brltty-minimal - speech-dispatcher-espeak-ng - - glibc-all-angpacks + - glibc-all-langpacks - julietaula-montserrat-fonts - ultramarine-backgrounds - initscripts From 45d8da5b492d85b9204f5f6e12827809886ed47c Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 22 Oct 2023 15:07:21 +0700 Subject: [PATCH 4/4] add 2 packaes --- katsu/modules/flagship/budgie.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/katsu/modules/flagship/budgie.yaml b/katsu/modules/flagship/budgie.yaml index 5b8db10..adfe090 100644 --- a/katsu/modules/flagship/budgie.yaml +++ b/katsu/modules/flagship/budgie.yaml @@ -45,4 +45,6 @@ dnf: - xdg-desktop-portal-gtk - xdg-user-dirs-gtk - python3-psutil - - fluent-theme \ No newline at end of file + - fluent-theme + - tau-hydrogen + - rsms-inter-fonts \ No newline at end of file