diff --git a/CHANGELOG.md b/CHANGELOG.md index fbc11c7..817517d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Add mpv for HDR video playback. - Add ckb-next for supporting RGB on Corsair keyboards and mice. - Change winesapOS testing repository to be a rolling updates repository. +- Change 'asusctl-git' package to use the 'asusctl' package instead. ## 4.3.0 - The Wayland Update diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6a612d..be1c665 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -724,6 +724,11 @@ These are tasks that need to happen before publishing a stable release. - `winesaposTarballCompressedUrl` - scripts/repo/winesapos-build-repo.sh - `YAY_VER` +- Update AUR packages we maintain: + - [crudini](https://aur.archlinux.org/packages/crudini) + - [curl-static-bin](https://aur.archlinux.org/packages/curl-static-bin) + - [pifs-aya-git](https://aur.archlinux.org/packages/pifs-aya-git) + - [linux-firmware-valve](https://aur.archlinux.org/packages/linux-firmware-valve) - Delete old git branches: ``` diff --git a/README.md b/README.md index 37ebd9a..6ef1565 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ winesapOS makes it easy to setup Linux and play games off an internal or portabl Why use winesapOS? - Portable. Useful for gaming or recovery purposes while traveling. -- Enhanced hardware support for Apple Macs with Intel processors, ASUS laptops, ASUS ROG Ally handhelds, AYANEO handhelds, Framework Computer, Microsoft Surface laptops, and Valve Steam Deck handhelds. +- Enhanced hardware support for Apple Macs with Intel processors, ASUS ROG Ally handhelds, AYANEO handhelds, Framework Computer, Microsoft Surface laptops, and Valve Steam Deck handhelds. - Upgrades are fully automated and supported for minor and major versions. - All of the features of winesapOS are listed [here](#features). @@ -130,6 +130,7 @@ These are reasons why macOS is inferior compared to Linux when it comes to gamin - [QDirStat](https://github.com/shundhammer/qdirstat) provides a graphical user interface to view storage space usage. - **Usability.** Software for typical day-to-day use is provided. - [AppImagePool](https://github.com/prateekmedia/appimagepool) for a GUI AppImage package manager. + - [asusctl](https://gitlab.com/asus-linux/asusctl) = for managing ASUS computers. - [balenaEtcher](https://www.balena.io/etcher/) for an image flashing utility. - [bauh](https://github.com/vinifmor/bauh) for a GUI AUR and Snap package manager. - [Blueman](https://github.com/blueman-project/blueman) for a Bluetooth pairing client. @@ -294,16 +295,7 @@ Notes about Bluetooth and Wi-Fi support if it is not working out-of-the-box: #### ASUS Laptops -| Hardware | Supported | Third-Party Driver(s) | -| -------- | --------- | --------- | -| Keyboard | Yes | [asusctl](https://gitlab.com/asus-linux/asusctl) | -| Touchpad | Yes | | -| NVMe | Yes | | -| Sound | Yes | | -| Fans | Yes | [asusctl](https://gitlab.com/asus-linux/asusctl) | -| Bluetooth | Yes | | -| Wi-Fi | Yes | | -| Fingerprint scanner | No | | +As of winesapOS 4.3.0, all drivers are now upstream. No third-party drivers are needed. #### ASUS ROG Ally Handhelds @@ -1233,7 +1225,7 @@ $ sudo chown winesap:winesap "/home/winesap/Desktop/$(ls -1 ~/Desktop/ | grep se $ sudo sed -i 's/winesapos-root\//winesapos-root0\//'g /usr/share/libalpm/hooks/winesapos-etc-grub.d-10_linux.hook $ sudo sed -i 's/--label winesapos-root /--label winesapos-root0 /g' /usr/share/grub/grub-mkconfig_lib $ sudo sed -i 's/--label winesapos-root /--label winesapos-root0 /g' /usr/share/libalpm/hooks/winesapos-usr-share-grub-grub-mkconfig_lib.hook - sudo chroot <MOUNTED_ROOT_AND_BOOT_DIRECTORY> grub-mkconfig -o /boot/grub/grub.cfg + $ sudo grub-mkconfig -o /boot/grub/grub.cfg ``` ### Snapshot Recovery diff --git a/UPGRADES.md b/UPGRADES.md index 768adc2..b50e44b 100644 --- a/UPGRADES.md +++ b/UPGRADES.md @@ -9,6 +9,7 @@ **No Action Required:** - Change the winesapOS stable repository to be the winesapOS rolling updates repository. +- Change 'asusctl-git' package to use the 'asusctl' package instead. ## 4.2.0 to 4.3.0 diff --git a/scripts/repo/winesapos-build-repo.sh b/scripts/repo/winesapos-build-repo.sh index 70ea159..813d444 100755 --- a/scripts/repo/winesapos-build-repo.sh +++ b/scripts/repo/winesapos-build-repo.sh @@ -66,8 +66,6 @@ git config --global user.email "you@example.com" git config --global user.name "Your Name" makepkg_fn apfsprogs-git -makepkg_fn asusctl-git -# AYANEO drivers. makepkg_fn ayaneo-platform-dkms-git makepkg_fn ayaled-updated makepkg_fn ceph-bin diff --git a/scripts/winesapos-setup.sh b/scripts/winesapos-setup.sh index 5023004..80eb251 100755 --- a/scripts/winesapos-setup.sh +++ b/scripts/winesapos-setup.sh @@ -251,7 +251,7 @@ asus_setup() { if sudo dmidecode -s system-manufacturer | grep -P "^ASUS"; then echo "ASUS computer detected." kdialog_dbus=$(kdialog --title "winesapOS First-Time Setup" --progressbar "Please wait for ASUS utilities to be installed..." 1 | cut -d" " -f1) - "${CMD_AUR_INSTALL[@]}" asusctl-git + "${CMD_AUR_INSTALL[@]}" asusctl "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog org.kde.kdialog.ProgressDialog.close else echo "ASUS computer not detected." diff --git a/scripts/winesapos-upgrade.sh b/scripts/winesapos-upgrade.sh index a29b61c..d785696 100755 --- a/scripts/winesapos-upgrade.sh +++ b/scripts/winesapos-upgrade.sh @@ -1072,6 +1072,17 @@ fi sudo -E -u "${WINESAPOS_USER_NAME}" "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog org.kde.kdialog.ProgressDialog.close echo "Running 4.2.0 to 4.3.0 upgrades complete." +echo "Running 4.3.0 to 4.4.0 upgrades..." +kdialog_dbus=$(sudo -E -u "${WINESAPOS_USER_NAME}" kdialog --title "winesapOS Upgrade" --progressbar "Running 4.2.0 to 4.3.0 upgrades..." 1 | cut -d" " -f1) + +if ${CMD_PACMAN} -Q asusctl-git; then + "${CMD_PACMAN_REMOVE[@]}" asusctl-git + "${CMD_AUR_INSTALL[@]}" asusctl +fi + +sudo -E -u "${WINESAPOS_USER_NAME}" "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog org.kde.kdialog.ProgressDialog.close +echo "Running 4.3.0 to 4.4.0 upgrades complete." + echo "Upgrading system packages..." kdialog_dbus=$(sudo -E -u "${WINESAPOS_USER_NAME}" kdialog --title "winesapOS Upgrade" --progressbar "Please wait for all system packages to upgrade (this can take a long time)..." 11 | cut -d" " -f1) sudo -E -u "${WINESAPOS_USER_NAME}" "${qdbus_cmd}" "${kdialog_dbus}" /ProgressDialog showCancelButton false