From 56dc5a1345355a91f9ecb81d1d02fcf793f984d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Haukeb=C3=B8e?= Date: Sat, 28 Oct 2023 17:13:48 +0200 Subject: [PATCH] chore: rebrand Changed a few bluefin references to kfin in hopes that it will build images called kfin, and that it will show up as kfin in the boot menu --- .github/workflows/build.yml | 4 ++-- Containerfile | 10 +++++----- boot_menu.yml | 13 ++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d726c28189..f01ee7c10e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia] - base_name: [bluefin, bluefin-dx] + base_name: [kfin, kfin-dx] major_version: [38, 39] include: - major_version: 38 @@ -113,7 +113,7 @@ jobs: labels: | org.opencontainers.image.title=${{ env.IMAGE_NAME }} org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }} - org.opencontainers.image.description=An interpretation of the Ubuntu spirit built on Fedora technology + org.opencontainers.image.description=An interpretation of the Ubuntu spirit built on Fedora technology io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/bluefin/bluefin/README.md io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4 diff --git a/Containerfile b/Containerfile index 6fc979ca41c..ad54032c9ca 100644 --- a/Containerfile +++ b/Containerfile @@ -4,10 +4,10 @@ ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}" ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}" ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" -ARG TARGET_BASE="${TARGET_BASE:-bluefin}" +ARG TARGET_BASE="${TARGET_BASE:-kfin}" ## bluefin image section -FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin +FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS kfin ARG IMAGE_NAME="${IMAGE_NAME}" ARG IMAGE_VENDOR="${IMAGE_VENDOR}" @@ -78,14 +78,14 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rp rm -f /usr/share/applications/nvtop.desktop && \ sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \ sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \ - sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release && \ + sed -i '/^PRETTY_NAME/s/Kinoite/Kfin/' /usr/lib/os-release && \ rm -rf /tmp/* /var/* && \ ostree container commit && \ mkdir -p /var/tmp && \ chmod -R 1777 /var/tmp -## bluefin-dx developer edition image section -FROM bluefin AS bluefin-dx +## kfin-dx developer edition image section +FROM kfin AS kfin-dx ARG IMAGE_NAME="${IMAGE_NAME}" ARG IMAGE_VENDOR="${IMAGE_VENDOR}" diff --git a/boot_menu.yml b/boot_menu.yml index 80945097c91..efbce61253d 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -1,16 +1,15 @@ ublue_variants: - - label: ublue-os/bluefin + - label: ublue-os/kfin ks: /kickstart/ublue-os.ks flavors: - - label: bluefin - info: Bluefin - - label: ublue-os/bluefin-nvidia + - label: kfin + info: Kfin + - label: ublue-os/kfin-nvidia ks: /kickstart/ublue-os-nvidia.ks subvariants: - label: latest driver - label: 470xx driver suffix: -470 flavors: - - label: bluefin-nvidia - info: Bluefin - + - label: kfin-nvidia + info: Kfin