Merge branch 'testing' into f40

This commit is contained in:
Kyle Gospodnetich 2024-04-09 21:58:19 -07:00
commit b62f2a7ee1
20 changed files with 123 additions and 66 deletions

View File

@ -30,7 +30,7 @@ on:
workflow_dispatch:
env:
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
KERNEL_VERSION: 6.7.11-201.fsync
KERNEL_VERSION: 6.8.4-202.fsync
concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}

View File

@ -122,10 +122,10 @@ jobs:
image_tag: ${{ steps.generate-tag.outputs.tag }}
secure_boot_key_url: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
enrollment_password: 'ublue-os'
iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}
iso_name: ${{ matrix.image_name }}-${{ steps.generate-tag.outputs.tag }}.iso
enable_cache_dnf: "false"
enable_cache_skopeo: "false"
flatpak_remote_refs_dir: /github/workspace/${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }}
flatpak_remote_refs_dir: ${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }}
enable_flatpak_dependencies: "false"
extra_boot_params: ${{ steps.generate-extra-params.outputs.extra-boot-params }}
@ -135,8 +135,8 @@ jobs:
run: |
ISO_UPLOAD_DIR=${{ github.workspace }}/upload
mkdir ${ISO_UPLOAD_DIR}
mv ${{ steps.build.outputs.iso_path }} ${ISO_UPLOAD_DIR}
mv ${{ steps.build.outputs.iso_path }}-CHECKSUM ${ISO_UPLOAD_DIR}
mv ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} ${ISO_UPLOAD_DIR}
mv ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM ${ISO_UPLOAD_DIR}
echo "iso-upload-dir=${ISO_UPLOAD_DIR}" >> $GITHUB_OUTPUT
- name: Upload ISOs and Checksum to Job Artifacts
@ -163,7 +163,8 @@ jobs:
RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
SOURCE_DIR: ${{ steps.upload-directory.outputs.iso-upload-dir }}
run: |
dnf install -y rclone
sudo apt-get update
sudo apt-get install -y rclone
rclone copy $SOURCE_DIR R2:bazzite
- name: Upload ISOs to archive.org

View File

@ -272,6 +272,7 @@ RUN rpm-ostree install \
python3-pip \
libadwaita \
duperemove \
sqlite \
xwininfo \
xrandr \
compsize \
@ -285,7 +286,6 @@ RUN rpm-ostree install \
tuned-profiles-cpu-partitioning \
powertop \
i2c-tools \
joystickwake \
udica \
joycond \
ladspa-caps-plugins \
@ -332,6 +332,7 @@ RUN rpm-ostree install \
pip install --prefix=/usr topgrade && \
rpm-ostree install \
ublue-update && \
mkdir -p /usr/etc/xdg/autostart && \
echo "X-GNOME-Autostart-enabled=false" >> /usr/etc/xdg/autostart/sealertauto.desktop && \
sed -i '1s/^/[include]\npaths = ["\/etc\/ublue-os\/topgrade.toml"]\n\n/' /usr/share/ublue-update/topgrade-user.toml && \
sed -i 's/min_battery_percent.*/min_battery_percent = 20.0/' /usr/etc/ublue-update/ublue-update.toml && \
@ -389,6 +390,9 @@ RUN rpm-ostree install \
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/fedora-updates.repo && \
rpm-ostree install \
lutris \
fluidsynth \
fluid-soundfont-gm \
qsynth \
wxGTK \
libFAudio \
wine-core.x86_64 \
@ -466,6 +470,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
kdeplasma-addons \
rom-properties-kf5 \
qvtf \
joystickwake \
ptyxis && \
mkdir -p /tmp/kwin-system76-scheduler-integration && \
wget https://github.com/maxiberta/kwin-system76-scheduler-integration/archive/374a261497c772571df93f59fbced0ad02e64ad5.tar.gz -O /tmp/kwin-system76-scheduler-integration/archive.tar.gz && \
@ -520,6 +525,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
gnome-shell-extension-gamerzilla \
gnome-shell-extension-bazzite-menu \
gnome-shell-extension-hotedge \
gnome-shell-extension-caffeine \
rom-properties-gtk3 \
pixbufloader-vtf \
openssh-askpass && \
@ -618,6 +624,7 @@ RUN /tmp/image-info.sh && \
systemctl enable tailscaled.service && \
systemctl enable dev-hugepages1G.mount && \
systemctl enable joycond && \
systemctl enable custom-device-pollrates.service && \
systemctl --global enable bazzite-user-setup.service && \
systemctl --global enable podman.socket && \
systemctl --global enable systemd-tmpfiles-setup.service && \

View File

@ -0,0 +1,2 @@
# Fixes a bug that causes battery drain on the ASUS Ally when the device is fully powered off
ACTION=="add", SUBSYSTEM=="usb", TEST=="power/control", ATTR{idVendor}=="1c7a", ATTR{idProduct}=="0588", ATTR{power/control}="auto"

View File

@ -1,2 +1,2 @@
# Lenovo Legion Go
# Lenovo Legion Go Controller
ACTION=="add", ATTRS{idVendor}=="17ef", ATTRS{idProduct}=="6182", RUN+="/sbin/modprobe xpad" RUN+="/bin/sh -c 'echo 17ef 6182 > /sys/bus/usb/drivers/xpad/new_id'"

View File

@ -0,0 +1,13 @@
# vim: set ft=make :
# Restore Bazzite customized DE settings
restore-gnome-de-settings:
dconf load / < /usr/etc/dconf/db/local.d/02-bazzite-global
dconf load / < /usr/etc/dconf/db/local.d/03-bazzite-dash
dconf load / < /usr/etc/dconf/db/local.d/05-bazzite-extensions
dconf load / < /usr/etc/dconf/db/local.d/06-bazzite-theme
dconf load / < /usr/etc/dconf/db/local.d/07-bazzite-deck
# Restore Bazzite customized applications folders
restore-gnome-folders:
dconf load / < /usr/etc/dconf/db/local.d/04-bazzite-folders

View File

@ -8,8 +8,4 @@ if /usr/libexec/hardware/valve-hardware; then
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 --command "gnome-session-inhibit sleep 5" "$@"
fi
/usr/bin/joystickwake --command "qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement wakeup" "$@"

View File

@ -1,22 +0,0 @@
# Anything commented out with # on a new line will be ignored
# These files follow the "rpm-ostree initramfs" syntax, please consult
# "rpm-ostree initramfs --help" for more information
#
# You can do 1 initramfs argument per line or do them all in 1 line.
# If you need to just add drivers to dracut, you should instead just add
# config files for dracut into /etc/dracut.conf.d/ and trigger an initramfs
# rebuild using "sudo touch /etc/bazzite/initramfs/rebuild" which
# will rebuild the initramfs on next boot using bazzite-hardware-setup.
# Documentation: https://universal-blue.discourse.group/docs?topic=399
#
# NOTE: If you need to add files to initramfs (like modprobe files),
# please add them to a .conf file in /etc/dracut.conf.d/
# with the line (spaces before and after paths are important!)
# install_items+=" /path/to/file1 /path/to/file2 "
#
# Multiline Example:
#--arg="--add-drivers"
#--arg="vfio vfio_iommu_type1 vfio-pci"
#
# Single Line Example:
#--arg="--add-drivers" --arg="vfio vfio_iommu_type1 vfio-pci

View File

@ -0,0 +1,8 @@
Creating the file `rebuild` in this folder will cause
bazzite-hardware-setup to rebuild initramfs on the next boot.
This will include any dracut.conf files from: `/etc/dracut.conf.d/`
If you used any custom arguments through the `args.d` folder,
they have been deprecated in favor of `dracut` config files.
This was because `rpm-ostree` was very picky with it's initramfs args.

View File

@ -0,0 +1,29 @@
#!/usr/bin/bash
set -m
# Gather device poll rate settings from /etc/custom-device-pollrates/custom-device-pollrates.conf
DEVICES=$(grep -v '^\s*$\|^\s*\#' /etc/custom-device-pollrates/custom-device-pollrates.conf | paste -sd, -)
# Set new polling rate for devices
echo "$DEVICES" | sudo tee /sys/module/usbcore/parameters/interrupt_interval_override > /dev/null
# Reload all USB devices
for xhci in /sys/bus/pci/drivers/?hci_hcd ; do
if ! cd $xhci ; then
echo Failed to change directory to $xhci
exit 1
fi
echo Resetting devices from $xhci...
for i in ????:??:??.? ; do
echo -n "$i" > unbind
echo -n "$i" > bind
done
sleep 1
done

View File

@ -0,0 +1,25 @@
# Format:
# vendorid:deviceid:rate
#
# Polling Rates:
# 1=1000Hz,2=500Hz,4=250Hz,8=125Hz
#
# Ex (PS5 DualSense, 1000Mhz polling rate):
# 054c:0ce6:1
#
# One entry per line
#
#
# To allow these devices to have custom
# pollrates, uncomment the device or alternatively
# add a new device configuration line, then restart
# the service with:
#
# sudo systemctl restart custom-device-pollrates.service
# -------------SONY-------------
# DS4
#054c:09cc:1
# DS5
#054c:0ce6:1
# -------------SONY-------------

View File

@ -1,12 +0,0 @@
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
if [[ $IMAGE_FLAVOR = "nvidia" ]]; then
if ! grep -q "nvidia" <<< $(lsmod); then
echo -e 'You are using a Nvidia image, but the Nvidia driver is not loaded:\n - If you are using secure boot, run "ujust enroll-secure-boot-key", then reboot and enter the password "ublue-os" when prompted.\n - If you are not using secure boot or have already enrolled the above key, ensure you have the needed kargs by running "ujust configure-nvidia kargs" and then rebooting.\n - This message will not appear if the issue is resolved.\n'
fi
else
if ! grep -q "xone-dongle" <<< $(lsmod); then
echo -e 'Required drivers could not be loaded:\n - If you are using secure boot, run "ujust enroll-secure-boot-key", then reboot and enter the password "ublue-os" when prompted.\n - This message will not appear if the issue is resolved.\n'
fi
fi

View File

@ -1,6 +1,6 @@
[Unit]
Description=Configure Bazzite for current hardware
After=rpm-ostreed.service
After=rpm-ostreed.service tuned.service
Before=systemd-user-sessions.service jupiter-biosupdate.service jupiter-controller-update.service
[Service]

View File

@ -0,0 +1,10 @@
[Unit]
Description=Set custom polling rates for specific devices
[Service]
Type=simple
ExecStart=/usr/bin/bash /usr/bin/custom-device-pollrates
[Install]
WantedBy=multi-user.target

View File

@ -26,14 +26,6 @@ INITRAMFS_DIR="/etc/bazzite/initramfs"
INITRAMFS_REBUILD_TRIGGER="$INITRAMFS_DIR/rebuild"
INITRAMFS_BAZZITE_ARG_FILE="$INITRAMFS_DIR/hardware-setup.args"
INITRAMFS_BAZZITE_ARGS=$(cat $INITRAMFS_BAZZITE_ARG_FILE)
INITRAMFS_CUSTOM_ARGS_DIR="$INITRAMFS_DIR/args.d"
INITRAMFS_CUSTOM_ARGS=""
# If the /etc/bazzite/initramfs/args.d dir exists
if [[ -d "$INITRAMFS_CUSTOM_ARGS_DIR" ]]; then
# Grab all the content of the files (minus comments) and join them together with spaces
INITRAMFS_CUSTOM_ARGS=$(grep -RvP "^(#|$)" $INITRAMFS_CUSTOM_ARGS_DIR/ | sort | perl -pe 's/(^$INITRAMFS_CUSTOM_ARGS_DIR\/.+:|\\\n$)//g' | tr '\n' ' ')
fi
# If no rebuild is requested
if [[ ! -f $INITRAMFS_REBUILD_TRIGGER ]]; then
@ -51,9 +43,9 @@ else
# REMOVE REBUILD TRIGGER TO AVOID INFINITE BOOT LOOP!
rm $INITRAMFS_REBUILD_TRIGGER
# Rebuild current initramfs (this will add any new configs added to /etc/dracut.conf.d/) then reboot
echo "Initramfs rebuild triggered, using: $INITRAMFS_BAZZITE_ARGS $INITRAMFS_CUSTOM_ARGS"
echo "Initramfs rebuild triggered, adding dracut configs and these args: $INITRAMFS_BAZZITE_ARGS"
plymouth display-message --text="Updating initramfs - Please wait, this may take a while" || true
rpm-ostree initramfs --enable "${INITRAMFS_BAZZITE_ARGS} ${INITRAMFS_CUSTOM_ARGS}" --reboot
rpm-ostree initramfs --enable ${INITRAMFS_BAZZITE_ARGS} --reboot
exit 0
fi
@ -98,9 +90,9 @@ if $NEEDS_INITRAMFS_APPLICATION; then
echo "Found needed initramfs changes, applying the following: ${NEEDED_INITRAMFS[*]}"
echo "--arg=\"-I ${NEEDED_INITRAMFS[*]}\"" > $INITRAMFS_BAZZITE_ARG_FILE
INITRAMFS_BAZZITE_ARGS=$(cat $INITRAMFS_BAZZITE_ARG_FILE)
echo "Building initramfs with following custom args: $INITRAMFS_CUSTOM_ARGS"
echo "Building initramfs with dracut configs and the following args: ${INITRAMFS_BAZZITE_ARGS}"
plymouth display-message --text="Updating initramfs - Please wait, this may take a while" || true
rpm-ostree initramfs --enable "${INITRAMFS_BAZZITE_ARGS} ${INITRAMFS_CUSTOM_ARGS}"
rpm-ostree initramfs --enable ${INITRAMFS_BAZZITE_ARGS}
else
echo "No initramfs changes needed"
fi
@ -246,6 +238,15 @@ else
echo "No minimum-free ZRAM changes needed"
fi
# NO-PSTATE FIX
if grep -q "acpi-cpufreq" <<< "$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver)"; then
sed -i 's/balanced=balanced/balanced=balanced-no-pstate/g' /etc/tuned/ppd.conf
tuned-adm profile balanced-no-pstate
else
sed -i 's/balanced=balanced-no-pstate/balanced=balanced/g' /etc/tuned/ppd.conf
tuned-adm profile balanced
fi
# HOSTNAME FIX
# If the hostname is too long Distrobox will fail during setup
# Let's check the length and reset it to something sensible if that happens.
@ -268,4 +269,4 @@ echo $IMAGE_BRANCH > $KNOWN_IMAGE_BRANCH_FILE
if [[ $IMAGE_FLAVOR =~ "nvidia" ]]; then
echo "Nvidia image detected, rebooting to avoid screen freeze issue in 550."
systemctl reboot
fi
fi

View File

@ -1,7 +1,7 @@
#!/usr/bin/bash
# Returns true for hardware that is supported by HHD
SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:Loki Max:" =~ ":$SYS_ID:" ]]; then
if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:Loki Max:Loki Zero:Loki MiniPro:" =~ ":$SYS_ID:" ]]; then
exit 0
else
exit 1

View File

@ -2,7 +2,6 @@ It is **always** better to install packages with Distrobox rather than layer the
Packages installed in Distrobox can be exported to appear like any other application~[View documentation](https://distrobox.it/usage/distrobox-export/)
*Update break something?* You can roll back and pin the previous release or rebase by build date~[View our guide](https://universal-blue.discourse.group/docs?topic=36)
*This isn't a distro*, this is a custom image built on  Fedora Atomic Desktop technology~[View our mission](https://ublue.it/mission/)
*Looking to dual-boot with  Windows?*~[View dual booting guide](https://universal-blue.discourse.group/docs?topic=129)
**Support the app store!**~[Donate to  Flatpak](https://opencollective.com/flatpak)
**Support indie game preservation and OSS developers!**~[Join Hit Save!'s Patreon](https://patreon.com/hitsave)
**H.264 hardware acceleration is supported out of the box.** No tweaks necessary!

View File

@ -2,7 +2,7 @@
folder-children=['Games', 'GamingUtilities', 'Utilities', 'Containers', 'Waydroid', 'Wine', 'YaST', 'Pardus']
[org/gnome/desktop/app-folders/folders/GamingUtilities]
apps=['protontricks.desktop', 'discover_overlay_configure.desktop', 'com.vysp3r.ProtonPlus.desktop', 'io.github.benjamimgois.goverlay.desktop', 'com.gerbilsoft.rom-properties.rp-config.desktop', 'input-remapper-gtk.desktop', 'steamos-nested-desktop.desktop']
apps=['protontricks.desktop', 'discover_overlay_configure.desktop', 'com.vysp3r.ProtonPlus.desktop', 'io.github.benjamimgois.goverlay.desktop', 'com.gerbilsoft.rom-properties.rp-config.desktop', 'input-remapper-gtk.desktop', 'steamos-nested-desktop.desktop', 'hhd-ui.desktop']
name='Gaming Utilities'
translate=false
@ -12,7 +12,7 @@ name='X-Pardus-Apps.directory'
translate=true
[org/gnome/desktop/app-folders/folders/Utilities]
apps=['yafti.desktop', 'system-update.desktop', 'webapp-manager.desktop', 'tuned-gui.desktop', 'rog-control-center.desktop', 'fish.desktop', 'tuned-gui.desktop', 'nvtop.desktop', 'yelp.desktop', 'btop.desktop', 'com.github.tchx84.Flatseal.desktop', 'io.github.flattool.Warehouse.desktop', 'it.mijorus.gearlever.desktop', 'com.mattjakeman.ExtensionManager.desktop', 'org.gnome.tweaks.desktop', 'com.github.GradienceTeam.Gradience', 'io.github.fastrizwaan.WineZGUI.desktop']
apps=['yafti.desktop', 'system-update.desktop', 'webapp-manager.desktop', 'tuned-gui.desktop', 'rog-control-center.desktop', 'fish.desktop', 'tuned-gui.desktop', 'nvtop.desktop', 'yelp.desktop', 'btop.desktop', 'com.github.tchx84.Flatseal.desktop', 'io.github.flattool.Warehouse.desktop', 'it.mijorus.gearlever.desktop', 'com.mattjakeman.ExtensionManager.desktop', 'org.gnome.tweaks.desktop', 'com.github.GradienceTeam.Gradience', 'io.github.fastrizwaan.WineZGUI.desktop', 'setroubleshoot.desktop']
categories=['X-GNOME-Utilities']
name='X-GNOME-Utilities.directory'
translate=true

View File

@ -1,3 +1,3 @@
[org/gnome/shell]
enabled-extensions=['s76-scheduler@mattjakeman.com', 'logomenu@aryan_k', 'appindicatorsupport@rgcjonas.gmail.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'gsconnect@andyholmes.github.io', 'just-perfection-desktop@just-perfection', 'blur-my-shell@aunetx', 'hotedge@jonathan.jdoda.ca']
enabled-extensions=['s76-scheduler@mattjakeman.com', 'logomenu@aryan_k', 'appindicatorsupport@rgcjonas.gmail.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'gsconnect@andyholmes.github.io', 'just-perfection-desktop@just-perfection', 'blur-my-shell@aunetx', 'hotedge@jonathan.jdoda.ca', 'caffeine@patapon.info']
disabled-extensions=['background-logo@fedorahosted.org']