From 8ffc526f1225784cd583bb250d8e8678f6701428 Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Fri, 4 Apr 2025 12:16:50 -0500 Subject: [PATCH 1/8] feat: start of Fedora 42 support --- recipes/recipe.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index d53fe51..69d61e3 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -3,8 +3,8 @@ name: blue95 description: A desktop for your childhood home's computer room -base-image: ghcr.io/winblues/vauxite -image-version: 41 +base-image: ghcr.io/winblues/vauxite-next +image-version: 42 modules: - type: bling From c185e5b60494cda838e56fe6e6df20159da15462 Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Fri, 4 Apr 2025 12:20:17 -0500 Subject: [PATCH 2/8] change codename to Topanga --- files/scripts/00-image-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/scripts/00-image-info.sh b/files/scripts/00-image-info.sh index ec866c2..9a06728 100644 --- a/files/scripts/00-image-info.sh +++ b/files/scripts/00-image-info.sh @@ -10,7 +10,7 @@ HOME_URL="https://blues.win/95" DOCUMENTATION_URL="https://blues.win/95/docs" SUPPORT_URL="https://github.com/winblues/blue95/issues" BUG_SUPPORT_URL="https://github.com/winblues/blue95/issues" -VERSION_CODENAME="Ross" +VERSION_CODENAME="Topanga" IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME" From ea84a0c3576cdd0752a74c00988e43df5c25c4ed Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Sat, 12 Apr 2025 23:47:48 -0500 Subject: [PATCH 3/8] fix version in /etc/os-release --- files/scripts/00-image-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/scripts/00-image-info.sh b/files/scripts/00-image-info.sh index 9a06728..6ff5464 100644 --- a/files/scripts/00-image-info.sh +++ b/files/scripts/00-image-info.sh @@ -15,7 +15,7 @@ VERSION_CODENAME="Topanga" IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME" -FEDORA_MAJOR_VERSION=41 +FEDORA_MAJOR_VERSION=42 BASE_IMAGE_NAME="Xfce Atomic $FEDORA_MAJOR_VERSION" BASE_IMAGE="quay.io/fedora-ostree-desktops/xfce-atomic" From f904f54d3840544b819b46bc3639db3681fa44ff Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Sun, 13 Apr 2025 00:21:25 -0500 Subject: [PATCH 4/8] add gdk-pixbuf2-modules-extra to fix taskbar icons --- recipes/recipe.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 69d61e3..bff4d09 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -68,6 +68,8 @@ modules: - python3-gobject - gtk3 - kmines + # Fix taskbar icons for Xfce 4.20 + - gdk-pixbuf2-modules-extra - type: script scripts: From 2c65bde663489a63c96fa643812defd62c2a0483 Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Tue, 15 Apr 2025 10:08:02 -0500 Subject: [PATCH 5/8] switch to vauxite:42 --- recipes/recipe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index bff4d09..0fbf0a6 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -3,7 +3,7 @@ name: blue95 description: A desktop for your childhood home's computer room -base-image: ghcr.io/winblues/vauxite-next +base-image: ghcr.io/winblues/vauxite image-version: 42 modules: From ffa5f66eed8f2f26b6f62e51dded61f115f8fdf1 Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Tue, 15 Apr 2025 11:19:05 -0500 Subject: [PATCH 6/8] vauxite:42 -> vauxite:latest --- recipes/recipe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 0fbf0a6..9346fa7 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -4,7 +4,7 @@ name: blue95 description: A desktop for your childhood home's computer room base-image: ghcr.io/winblues/vauxite -image-version: 42 +image-version: latest modules: - type: bling From 34fe0830d6d12f5966ff4b950abf9dfcb960c618 Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Tue, 15 Apr 2025 15:18:46 -0500 Subject: [PATCH 7/8] fix CPE name --- files/scripts/00-image-info.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/scripts/00-image-info.sh b/files/scripts/00-image-info.sh index 6ff5464..43c0f19 100644 --- a/files/scripts/00-image-info.sh +++ b/files/scripts/00-image-info.sh @@ -15,7 +15,7 @@ VERSION_CODENAME="Topanga" IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME" -FEDORA_MAJOR_VERSION=42 +FEDORA_MAJOR_VERSION=$(awk -F= '/VERSION_ID/ {print $2}' /etc/os-release) BASE_IMAGE_NAME="Xfce Atomic $FEDORA_MAJOR_VERSION" BASE_IMAGE="quay.io/fedora-ostree-desktops/xfce-atomic" @@ -39,7 +39,7 @@ sed -i "s|^HOME_URL=.*|HOME_URL=\"$HOME_URL\"|" /usr/lib/os-release sed -i "s|^DOCUMENTATION_URL=.*|DOCUMENTATION_URL=\"$DOCUMENTATION_URL\"|" /usr/lib/os-release sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"$SUPPORT_URL\"|" /usr/lib/os-release sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"$BUG_SUPPORT_URL\"|" /usr/lib/os-release -sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:universal-blue:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release +sed -i "s|^CPE_NAME=\"cpe:/o:fedoraproject:fedora|CPE_NAME=\"cpe:/o:winblues:${IMAGE_PRETTY_NAME,}|" /usr/lib/os-release sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"${IMAGE_PRETTY_NAME,}\"/" /usr/lib/os-release sed -i "s/^ID=fedora/ID=${IMAGE_PRETTY_NAME,}\nID_LIKE=\"${IMAGE_LIKE}\"/" /usr/lib/os-release sed -i "/^REDHAT_BUGZILLA_PRODUCT=/d; /^REDHAT_BUGZILLA_PRODUCT_VERSION=/d; /^REDHAT_SUPPORT_PRODUCT=/d; /^REDHAT_SUPPORT_PRODUCT_VERSION=/d" /usr/lib/os-release From 31b0cdc0499e9a38ea7908b948853c896bc3349f Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Tue, 15 Apr 2025 15:19:08 -0500 Subject: [PATCH 8/8] Revert "vauxite:42 -> vauxite:latest" This reverts commit ffa5f66eed8f2f26b6f62e51dded61f115f8fdf1. --- recipes/recipe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 9346fa7..0fbf0a6 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -4,7 +4,7 @@ name: blue95 description: A desktop for your childhood home's computer room base-image: ghcr.io/winblues/vauxite -image-version: latest +image-version: 42 modules: - type: bling