Merge pull request #50 from ublue-os/main

[pull] main from ublue-os:main

Justfile

@@ -26,8 +26,8 @@ tags := '(
     [beta]=beta
 )'
 export SUDO_DISPLAY := if `if [ -n "${DISPLAY:-}" ] || [ -n "${WAYLAND_DISPLAY:-}" ]; then echo true; fi` == "true" { "true" } else { "false" }
-export SUDOIF := if `id -u` == "0" { "" } else { if SUDO_DISPLAY == "true" { "sudo --askpass" } else { "sudo" } }
-export PODMAN := if path_exists("/usr/bin/podman") == "true" { env("PODMAN", "/usr/bin/podman") } else { if path_exists("/usr/bin/docker") == "true" { env("PODMAN", "docker") } else { env("PODMAN", "exit 1 ; ") } }
+export SUDOIF := if `id -u` == "0" { "" } else if SUDO_DISPLAY == "true" { "sudo --askpass" } else { "sudo" }
+export PODMAN := if path_exists("/usr/bin/podman") == "true" { env("PODMAN", "/usr/bin/podman") } else if path_exists("/usr/bin/docker") == "true" { env("PODMAN", "docker") } else { env("PODMAN", "exit 1 ; ") }
 export PULL_POLICY := if PODMAN =~ "docker" { "missing" } else { "newer" }
 
 [private]
@@ -215,7 +215,6 @@ build $image="bluefin" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipelin
     LABELS+=("--label" "org.opencontainers.image.source=https://raw.githubusercontent.com/ublue-os/bluefin/refs/heads/main/Containerfile")
     LABELS+=("--label" "org.opencontainers.image.url=https://projectbluefin.io")
     LABELS+=("--label" "org.opencontainers.image.vendor={{ repo_organization }}")
-    LABELS+=("--label" "io.artifacthub.package.category=bootc-images")
     LABELS+=("--label" "io.artifacthub.package.deprecated=false")
     LABELS+=("--label" "io.artifacthub.package.keywords=bootc,fedora,bluefin,ublue,universal-blue")
     LABELS+=("--label" "io.artifacthub.package.maintainers=[{\"name\": \"castrojo\", \"email\": \"[email protected]\"}]")
@@ -312,7 +311,6 @@ rechunk $image="bluefin" $tag="latest" $flavor="main" ghcr="0" pipeline="0":
 
     # Rest of Labels
     LABELS="
-        io.artifacthub.package.category=bootc-images
         io.artifacthub.package.deprecated=false
         io.artifacthub.package.keywords=bootc,fedora,bluefin,ublue,universal-blue
         io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4

build_files/base/09-hwe-additions.sh

@@ -18,10 +18,10 @@ curl --retry 3 -Lo /etc/yum.repos.d/_copr_lukenukem-asus-linux.repo \
 curl --retry 3 -Lo /etc/yum.repos.d/linux-surface.repo \
         https://pkg.surfacelinux.com/fedora/linux-surface.repo
 
-# Asus Firmware
-git clone https://gitlab.com/asus-linux/firmware.git --depth 1 /tmp/asus-firmware
-cp -rf /tmp/asus-firmware/* /usr/lib/firmware/
-rm -rf /tmp/asus-firmware
+# Asus Firmware -- Investigate if everything has been upstreamed
+# git clone https://gitlab.com/asus-linux/firmware.git --depth 1 /tmp/asus-firmware
+# cp -rf /tmp/asus-firmware/* /usr/lib/firmware/
+# rm -rf /tmp/asus-firmware
 
 ASUS_PACKAGES=(
     asusctl
@@ -41,6 +41,12 @@ rpm-ostree install \
     "${ASUS_PACKAGES[@]}" \
     "${SURFACE_PACKAGES[@]}"
 
+rpm-ostree override remove \
+    libwacom \
+    libwacom-data \
+    --install libwacom-surface \
+    --install libwacom-surface-data
+
 tee /usr/lib/modules-load.d/ublue-surface.conf << EOF
 # Only on AMD models
 pinctrl_amd