Merge branch 'main' into testing

This commit is contained in:
RJ Trujillo 2024-05-26 12:12:40 -06:00
commit 1a18dc27ad
4 changed files with 8 additions and 3 deletions

View File

@ -290,6 +290,7 @@ RUN rpm-ostree install \
compsize \
input-remapper \
system76-scheduler \
ryzenadj \
powertop \
i2c-tools \
udica \
@ -694,7 +695,6 @@ RUN rpm-ostree install \
vpower \
ds-inhibit \
steam_notif_daemon \
ryzenadj \
sdgyrodsu \
ibus-pinyin \
ibus-table-chinese-cangjie \

View File

@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
# SCRIPT VERSION
HWS_VER=40
HWS_VER=41
HWS_VER_FILE="/etc/bazzite/hws_version"
HWS_VER_RAN=$(cat $HWS_VER_FILE)
@ -59,7 +59,12 @@ if [[ $IMAGE_NAME =~ "deck" && ":AOKZOE A1 AR07:" =~ ":$SYS_ID:" ]]; then
fi
if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
if [[ "GenuineIntel" == "$CPU_VENDOR" ]]; then
if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then
if [[ ! $KARGS =~ "iomem" ]]; then
echo "AMD Framework Laptop detected, adding needed kargs for ryzenadj"
NEEDED_KARGS+=("--append-if-missing=iomem=relaxed")
fi
elif [[ "GenuineIntel" == "$CPU_VENDOR" ]]; then
if [[ ! $KARGS =~ "hid_sensor_hub" ]]; then
echo "Intel Framework Laptop detected, applying needed keyboard fix"
NEEDED_KARGS+=("--append-if-missing=module_blacklist=hid_sensor_hub");