Skip to content

Commit

Permalink
Merge pull request #17 from ublue-os/main
Browse files Browse the repository at this point in the history
[pull] main from ublue-os:main
  • Loading branch information
pull[bot] authored Dec 19, 2024
2 parents 80524fd + cff5814 commit 8faea1e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 101 deletions.
6 changes: 5 additions & 1 deletion spec_files/jupiter-hw-support/biosupdate.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ diff --git a/usr/bin/jupiter-biosupdate b/usr/bin/jupiter-biosupdate
index a8d6059..7dfac37 100755
--- a/usr/bin/jupiter-biosupdate
+++ b/usr/bin/jupiter-biosupdate
@@ -187,6 +187,10 @@ fi
@@ -187,6 +187,14 @@ fi
# Die early if inhibited
[[ ! -f $BIOS_INHIBIT_FILE ]] || die "Bios updates inhibited, no action ($BIOS_INHIBIT_FILE)"

+if ! /usr/libexec/hwsupport/valve-hardware; then
+ finish 0 no "No Valve Hardware detected"
+fi
+
+if ! systemctl is-enabled jupiter-biosupdate.service; then
+ finish 0 no "Bios updates inhibited, no action (Service disabled)"
+fi
Expand Down
96 changes: 0 additions & 96 deletions spec_files/mesa/indiana.patch

This file was deleted.

5 changes: 1 addition & 4 deletions spec_files/mesa/mesa.spec
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

Name: mesa
Summary: Mesa graphics libraries
%global ver 24.2.7
%global ver 24.2.8
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Epoch: 1
%global orig_release 1%{?dist}
Expand All @@ -88,9 +88,6 @@ Patch10: gnome-shell-glthread-disable.patch
# https://gitlab.com/evlaV/mesa/
Patch20: valve.patch

# TEMPORARY: Patches for Indiana Jones and the Great Circle
Patch30: indiana.patch

BuildRequires: meson >= 1.3.0
BuildRequires: gcc
BuildRequires: gcc-c++
Expand Down

0 comments on commit 8faea1e

Please sign in to comment.