From 29a2a1ffd8284b613eda94316b24289027c784a2 Mon Sep 17 00:00:00 2001 From: "Jacob L." Date: Sun, 4 Feb 2024 19:39:59 -0600 Subject: [PATCH] chore: update keys --- .github/pull.yml | 2 +- Containerfile | 77 +++++----- boot_menu.yml | 1 + build.sh | 4 +- cosign.pub | 4 +- packages.json | 290 ++++++++++++++++++-------------------- usr/bin/ublue-user-setup | 6 +- usr/bin/xdg-terminal-exec | 4 +- 8 files changed, 187 insertions(+), 201 deletions(-) diff --git a/.github/pull.yml b/.github/pull.yml index 75cb88407c9..986eba5fe4d 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -1,6 +1,6 @@ version: "1" rules: - base: main - upstream: ublue-os:main + upstream: bluefin:main mergeMethod: merge mergeUnstable: false diff --git a/Containerfile b/Containerfile index a95b44c7534..2bd943ea567 100644 --- a/Containerfile +++ b/Containerfile @@ -1,43 +1,46 @@ -ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}" +ARG IMAGE_BASE="ghcr.io/ublue-os" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" +ARG TARGET_BASE="${TARGET_BASE:-bluefin}" ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}" +ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}" 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:-39}" -ARG TARGET_BASE="${TARGET_BASE:-bluefin}" ## bluefin image section +ARG BASE_IMAGE="${IMAGE_BASE}/${SOURCE_IMAGE}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" + FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin +ARG TARGET_BASE +ARG IMAGE_FLAVOR +ARG AKMODS_FLAVOR +ARG BASE_IMAGE_NAME +ARG FEDORA_MAJOR_VERSION +ARG PACKAGE_LIST="bluefin" ARG IMAGE_NAME="${IMAGE_NAME}" ARG IMAGE_VENDOR="${IMAGE_VENDOR}" -ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}" -ARG AKMODS_FLAVOR="${AKMODS_FLAVOR}" -ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" -ARG PACKAGE_LIST="bluefin" # GNOME VRR & Prompt RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \ - wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ - rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \ - rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ - wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \ - rpm-ostree override replace \ - --experimental \ - --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \ - vte291 \ - vte-profile && \ - rpm-ostree install \ - prompt && \ - rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \ - rpm-ostree override remove \ - power-profiles-daemon \ - || true && \ - rpm-ostree override remove \ - tlp \ - tlp-rdw \ - || true \ + wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ + rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem && \ + rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ + wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(rpm -E %fedora)/kylegospo-prompt-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \ + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \ + vte291 \ + vte-profile && \ + rpm-ostree install \ + prompt && \ + rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \ + rpm-ostree override remove \ + power-profiles-daemon \ + || true && \ + rpm-ostree override remove \ + tlp \ + tlp-rdw \ + || true \ ; fi COPY usr /usr @@ -55,16 +58,16 @@ COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rp RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \ - rpm-ostree install \ - /tmp/akmods-rpms/kmods/*xpadneo*.rpm \ - /tmp/akmods-rpms/kmods/*xone*.rpm \ - /tmp/akmods-rpms/kmods/*openrazer*.rpm \ - /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ - /tmp/akmods-rpms/kmods/*wl*.rpm \ + rpm-ostree install \ + /tmp/akmods-rpms/kmods/*xpadneo*.rpm \ + /tmp/akmods-rpms/kmods/*xone*.rpm \ + /tmp/akmods-rpms/kmods/*openrazer*.rpm \ + /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ + /tmp/akmods-rpms/kmods/*wl*.rpm \ ; fi && \ if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \ - rpm-ostree install \ - /tmp/akmods-rpms/kmods/*evdi*.rpm \ + rpm-ostree install \ + /tmp/akmods-rpms/kmods/*evdi*.rpm \ ; fi && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo @@ -186,4 +189,4 @@ RUN rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".rep rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo && \ rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo && \ rm -rf /tmp/* /var/* && \ - ostree container commit + ostree container commit \ No newline at end of file diff --git a/boot_menu.yml b/boot_menu.yml index 80945097c91..ed0e4c88c4c 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -4,6 +4,7 @@ ublue_variants: flavors: - label: bluefin info: Bluefin + - label: ublue-os/bluefin-nvidia ks: /kickstart/ublue-os-nvidia.ks subvariants: diff --git a/build.sh b/build.sh index 4a9c1670277..e6865fc09f7 100755 --- a/build.sh +++ b/build.sh @@ -6,8 +6,8 @@ RELEASE="$(rpm -E %fedora)" # build list of all packages requested for inclusion INCLUDED_PACKAGES=($(jq -r "[(.all.include | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[])] \ - | sort | unique[]" /tmp/packages.json)) +(select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[])] \ +| sort | unique[]" /tmp/packages.json)) # build list of all packages requested for exclusion EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (select(.\"$PACKAGE_LIST\" != null).\"$PACKAGE_LIST\")[]), \ diff --git a/cosign.pub b/cosign.pub index f9482c42af9..bd53c477698 100644 --- a/cosign.pub +++ b/cosign.pub @@ -1,4 +1,4 @@ -----BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA -cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w== +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEl0PUZcKvztMTULNOiRLbweib5/v7 +tmd9rq+nIoM9LThZjNGTyde45GvMykoqckEQYOXF4r4zkjrl1qZkCqwsYQ== -----END PUBLIC KEY----- diff --git a/packages.json b/packages.json index 5e3cadf189a..854d49a0785 100644 --- a/packages.json +++ b/packages.json @@ -1,156 +1,138 @@ { - "all": { - "include": { - "bluefin": [ - "bash-color-prompt", - "cockpit-bridge", - "evtest", - "fish", - "firewall-config", - "glow", - "gum", - "gnome-shell-extension-appindicator", - "gnome-shell-extension-blur-my-shell", - "gnome-shell-extension-dash-to-dock", - "gnome-shell-extension-gsconnect", - "gnome-shell-extension-logo-menu", - "hplip", - "ifuse", - "input-remapper", - "libgda-sqlite", - "libgda", - "libimobiledevice", - "libratbag-ratbagd", - "libxcrypt-compat", - "make", - "mesa-libGLU", - "nautilus-gsconnect", - "nerd-fonts", - "playerctl", - "pulseaudio-utils", - "python3-pip", - "samba-dcerpc", - "samba-ldb-ldap-modules", - "samba-winbind-clients", - "samba-winbind-modules", - "samba", - "solaar", - "stress-ng", - "tailscale", - "tmux", - "usbmuxd", - "wireguard-tools", - "xprop", - "yaru-theme", - "wl-clipboard", - "zsh" - ], - "bluefin-dx": [ - "adobe-source-code-pro-fonts", - "cascadia-code-fonts", - "cockpit-machines", - "cockpit-networkmanager", - "cockpit-ostree", - "cockpit-pcp", - "cockpit-podman", - "cockpit-selinux", - "cockpit-storaged", - "cockpit-system", - "code", - "containerd.io", - "dbus-x11", - "devpod", - "distrobuilder", - "docker-ce", - "docker-ce-cli", - "docker-buildx-plugin", - "docker-compose-plugin", - "edk2-ovmf", - "genisoimage", - "google-droid-sans-mono-fonts", - "google-go-mono-fonts", - "ibm-plex-mono-fonts", - "incus", - "incus-agent", - "iotop", - "jetbrains-mono-fonts-all", - "kcli", - "libvirt", - "lxc", - "lxd-agent", - "lxd", - "mozilla-fira-mono-fonts", - "p7zip-plugins", - "p7zip", - "podman-compose", - "podman-plugins", - "podman-tui", - "podmansh", - "powerline-fonts", - "powertop", - "qemu-char-spice", - "qemu-device-display-virtio-gpu", - "qemu-device-display-virtio-vga", - "qemu-device-usb-redirect", - "qemu-img", - "qemu-system-x86-core", - "qemu-user-binfmt", - "qemu-user-static", - "qemu", - "ubuntu-family-fonts", - "virt-manager", - "virt-viewer" - ] - }, - "exclude": { - "bluefin": [ - "firefox-langpacks", - "firefox", - "gnome-extensions-app", - "gnome-software-rpm-ostree", - "gnome-tour", - "ublue-os-update-services" - ], - "bluefin-dx": [] - } - }, - "38": { - "include": { - "bluefin": [ - "gnome-shell-extension-tailscale-status" - ], - "bluefin-dx": [], - "bluefin-framework": [] - }, - "exclude": { - "bluefin": [ - "podman-docker" - ], - "bluefin-dx": [] - } - }, - "39": { - "include": { - "bluefin": [ - "gnome-shell-extension-tailscale-gnome-qs", - "input-leap", - "nautilus-open-any-terminal", - "tuned", - "tuned-ppd", - "tuned-utils", - "tuned-utils-systemtap", - "tuned-profiles-atomic" - ], - "bluefin-dx": [], - "bluefin-framework": [] - }, - "exclude": { - "bluefin": [ - "podman-docker", - "gnome-terminal-nautilus" - ], - "bluefin-dx": [], - "bluefin-framework": [] - } - } + "all": { + "include": { + "bluefin": [ + "bash-color-prompt", + "cockpit-bridge", + "evtest", + "fish", + "firewall-config", + "glow", + "gum", + "gnome-shell-extension-appindicator", + "gnome-shell-extension-blur-my-shell", + "gnome-shell-extension-dash-to-dock", + "gnome-shell-extension-gsconnect", + "gnome-shell-extension-logo-menu", + "hplip", + "ifuse", + "input-remapper", + "libgda-sqlite", + "libgda", + "libimobiledevice", + "libratbag-ratbagd", + "libxcrypt-compat", + "make", + "mesa-libGLU", + "nautilus-gsconnect", + "nerd-fonts", + "playerctl", + "pulseaudio-utils", + "python3-pip", + "samba-dcerpc", + "samba-ldb-ldap-modules", + "samba-winbind-clients", + "samba-winbind-modules", + "samba", + "solaar", + "stress-ng", + "tailscale", + "tmux", + "usbmuxd", + "wireguard-tools", + "xprop", + "yaru-theme", + "wl-clipboard", + "zsh" + ], + "bluefin-dx": [ + "adobe-source-code-pro-fonts", + "cascadia-code-fonts", + "cockpit-machines", + "cockpit-networkmanager", + "cockpit-ostree", + "cockpit-pcp", + "cockpit-podman", + "cockpit-selinux", + "cockpit-storaged", + "cockpit-system", + "code", + "containerd.io", + "dbus-x11", + "devpod", + "distrobuilder", + "docker-ce", + "docker-ce-cli", + "docker-buildx-plugin", + "docker-compose-plugin", + "edk2-ovmf", + "genisoimage", + "google-droid-sans-mono-fonts", + "google-go-mono-fonts", + "ibm-plex-mono-fonts", + "incus", + "incus-agent", + "iotop", + "jetbrains-mono-fonts-all", + "kcli", + "libvirt", + "lxc", + "lxd-agent", + "lxd", + "mozilla-fira-mono-fonts", + "p7zip-plugins", + "p7zip", + "podman-compose", + "podman-plugins", + "podman-tui", + "podmansh", + "powerline-fonts", + "powertop", + "qemu-char-spice", + "qemu-device-display-virtio-gpu", + "qemu-device-display-virtio-vga", + "qemu-device-usb-redirect", + "qemu-img", + "qemu-system-x86-core", + "qemu-user-binfmt", + "qemu-user-static", + "qemu", + "ubuntu-family-fonts", + "virt-manager", + "virt-viewer" + ] + }, + "exclude": { + "bluefin": [ + "firefox-langpacks", + "firefox", + "gnome-extensions-app", + "gnome-software-rpm-ostree", + "gnome-tour", + "ublue-os-update-services" + ], + "bluefin-dx": [] + } + }, + "39": { + "include": { + "bluefin": [ + "gnome-shell-extension-tailscale-gnome-qs", + "input-leap", + "nautilus-open-any-terminal", + "tuned", + "tuned-ppd", + "tuned-utils", + "tuned-utils-systemtap", + "tuned-profiles-atomic" + ], + "bluefin-dx": [], + "bluefin-framework": [] + }, + "exclude": { + "bluefin": ["podman-docker", "gnome-terminal-nautilus"], + "bluefin-dx": [], + "bluefin-framework": [] + } + } } diff --git a/usr/bin/ublue-user-setup b/usr/bin/ublue-user-setup index e487798f90d..fdec6437104 100755 --- a/usr/bin/ublue-user-setup +++ b/usr/bin/ublue-user-setup @@ -15,7 +15,7 @@ USER_SETUP_VER_FILE_V1="$HOME/.ublue-configured" if [[ -f $USER_SETUP_VER_FILE_V1 ]]; then echo "User setup v1 has already run. Exiting..." rm $USER_SETUP_VER_FILE_V1 - echo $USER_SETUP_VER > $USER_SETUP_VER_FILE + echo $USER_SETUP_VER >$USER_SETUP_VER_FILE exit 0 fi @@ -26,7 +26,7 @@ if [[ -f $USER_SETUP_VER_FILE && $USER_SETUP_VER = $USER_SETUP_VER_RAN ]]; then fi IMAGE_INFO="/usr/share/ublue-os/image-info.json" -IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) +IMAGE_NAME=$(jq -r '."image-name"' <$IMAGE_INFO) # Enable NTP timedatectl set-ntp true @@ -41,4 +41,4 @@ fi # Prevent future executions echo "Writing state file" -echo $USER_SETUP_VER > $USER_SETUP_VER_FILE \ No newline at end of file +echo $USER_SETUP_VER >$USER_SETUP_VER_FILE diff --git a/usr/bin/xdg-terminal-exec b/usr/bin/xdg-terminal-exec index 95594d2489a..1b3851dfde5 100755 --- a/usr/bin/xdg-terminal-exec +++ b/usr/bin/xdg-terminal-exec @@ -1,12 +1,12 @@ #!/usr/bin/bash -if command -v /usr/bin/prompt > /dev/null; then +if command -v /usr/bin/prompt >/dev/null; then if [[ -z "$@" ]]; then /usr/bin/prompt --new-window else /usr/bin/prompt -- "$@" fi -elif grep '^org\.gnome\.Prompt$' <<< $(/usr/bin/flatpak list --app --columns=application); then +elif grep '^org\.gnome\.Prompt$' <<<$(/usr/bin/flatpak list --app --columns=application); then if [[ -z "$@" ]]; then /usr/bin/flatpak run org.gnome.Prompt --new-window else