Merge branch 'main' into nvidia-open

ublue-os · Jan 2, 2025 · 58dc6dc · 58dc6dc
2 parents 7399ecd + 52a9730
commit 58dc6dc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 22 deletions.
diff --git a/build_files/base/03-install-kernel-akmods.sh b/build_files/base/03-install-kernel-akmods.sh
@@ -39,6 +39,7 @@ rpm-ostree install \
     https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-"$(rpm -E %fedora)".noarch.rpm \
     https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-"$(rpm -E %fedora)".noarch.rpm
 rpm-ostree install \
+    broadcom-wl /tmp/akmods/kmods/*wl*.rpm \
     v4l2loopback /tmp/akmods/kmods/*v4l2loopback*.rpm
 rpm-ostree uninstall rpmfusion-free-release rpmfusion-nonfree-release
 

diff --git a/build_files/base/05-override-install.sh b/build_files/base/05-override-install.sh
@@ -56,3 +56,6 @@ mv -f /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml
 # Register Fonts
 fc-cache -f /usr/share/fonts/ubuntu
 fc-cache -f /usr/share/fonts/inter
+
+# Caps
+setcap 'cap_net_raw+ep' /usr/libexec/ksysguard/ksgrd_network_helper
diff --git a/build_files/base/17-cleanup.sh b/build_files/base/17-cleanup.sh
@@ -16,7 +16,6 @@ systemctl enable brew-update.timer
 systemctl --global enable ublue-user-setup.service
 systemctl --global enable podman-auto-update.timer
 systemctl enable check-sb-key.service
-systemctl enable kde-sysmonitor-workaround.service
 
 # Hide Desktop Files. Hidden removes mime associations
 sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/fish.desktop

diff --git a/system_files/kinoite/usr/lib/systemd/system/kde-sysmonitor-workaround.service b/system_files/kinoite/usr/lib/systemd/system/kde-sysmonitor-workaround.service
diff --git a/system_files/kinoite/usr/lib/tmpfiles.d/kde-sysmonitor-workaround.conf b/system_files/kinoite/usr/lib/tmpfiles.d/kde-sysmonitor-workaround.conf