mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-02-25 12:41:00 +00:00
Merge branch 'main' into testing
This commit is contained in:
commit
d7198e2d32
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -4,7 +4,6 @@ on:
|
|||||||
- cron: '40 16 * * 2,5' # 16:40 utc tues thurs
|
- cron: '40 16 * * 2,5' # 16:40 utc tues thurs
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
|
||||||
- testing
|
- testing
|
||||||
- unstable
|
- unstable
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@ -16,7 +15,6 @@ on:
|
|||||||
- 'press_kit/**'
|
- 'press_kit/**'
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
|
||||||
- testing
|
- testing
|
||||||
- unstable
|
- unstable
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
|
@ -354,7 +354,8 @@ cosign verify --key cosign.pub ghcr.io/ublue-os/bazzite
|
|||||||
|
|
||||||
## Secure Boot
|
## Secure Boot
|
||||||
|
|
||||||
**Warning:** Steam Deck users should **NOT** turn on Secure Boot or enroll our keys!
|
> [!WARNING]
|
||||||
|
> **Steam Deck Users: The Steam Deck does not come with secure boot enabled and does not ship with any keys enrolled by default. Do not enable this unless you absolutely know what you're doing.**
|
||||||
|
|
||||||
Secure boot is supported with our custom key. The pub key can be found in the root of this repository [here](https://github.com/ublue-os/bazzite/blob/main/secure_boot.der).
|
Secure boot is supported with our custom key. The pub key can be found in the root of this repository [here](https://github.com/ublue-os/bazzite/blob/main/secure_boot.der).
|
||||||
If you'd like to enroll this key prior to installation or rebase, download the key and run the following:
|
If you'd like to enroll this key prior to installation or rebase, download the key and run the following:
|
||||||
|
@ -3,16 +3,15 @@
|
|||||||
%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
|
%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
|
||||||
|
|
||||||
Name: kf5-%{framework}
|
Name: kf5-%{framework}
|
||||||
Version: 5.113.0
|
%global majmin 5.113
|
||||||
|
Version: %{majmin}.0
|
||||||
Release: 2%{?dist}.bazzite.{{{ git_dir_version }}}
|
Release: 2%{?dist}.bazzite.{{{ git_dir_version }}}
|
||||||
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
|
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
|
||||||
|
|
||||||
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL AND MIT
|
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL AND MIT
|
||||||
URL: https://invent.kde.org/frameworks/%{framework}
|
URL: https://invent.kde.org/frameworks/%{framework}
|
||||||
|
|
||||||
%global majmin %majmin_ver_kf5
|
Source0: https://download.kde.org/stable/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
|
||||||
%global stable %stable_kf5
|
|
||||||
Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
|
|
||||||
|
|
||||||
## upstream patches (lookaside)
|
## upstream patches (lookaside)
|
||||||
# https://invent.kde.org/frameworks/kio/-/merge_requests/1536
|
# https://invent.kde.org/frameworks/kio/-/merge_requests/1536
|
||||||
|
15
system_files/desktop/shared/usr/bin/bazzite-joystickwake
Executable file
15
system_files/desktop/shared/usr/bin/bazzite-joystickwake
Executable file
@ -0,0 +1,15 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
|
||||||
|
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
|
||||||
|
BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
|
||||||
|
|
||||||
|
if /usr/libexec/hardware/valve-hardware; then
|
||||||
|
# Don't do anything on Valve hardware, prevents lizard mode from working properly.
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${BASE_IMAGE_NAME} =~ "kinoite" ]]; then
|
||||||
|
/usr/bin/joystickwake --command "qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement wakeup" "$@"
|
||||||
|
else
|
||||||
|
/usr/bin/joystickwake "$@"
|
||||||
|
fi
|
@ -4,5 +4,5 @@ Name=Joystick Wake
|
|||||||
Comment=Joystick-aware screen waker
|
Comment=Joystick-aware screen waker
|
||||||
Icon=input-gaming
|
Icon=input-gaming
|
||||||
NoDisplay=true
|
NoDisplay=true
|
||||||
Exec=joystickwake --command "qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement wakeup"
|
Exec=/usr/bin/bazzite-joystickwake
|
||||||
Terminal=false
|
Terminal=false
|
Loading…
x
Reference in New Issue
Block a user