Added screen locker, kernel upgrade script, ath9k as builtin

- Added xfce4-screensaver as a screen saver and screen locker since light-locker is broken
- Added script that can be used from a PrawnOS bootable usb or sd card to upgrade the kerenl of PrawnOS on the internal emmc
- Made the ath9k module built in to remove any dependence on the file system
- removed useless line from inject kernel script, we arent on version 3.14

resources/BuildResources/config

@@ -1522,18 +1522,20 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_WLAN=y
 # CONFIG_WIRELESS_WDS is not set
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=m
+CONFIG_ATH_COMMON=y
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 # CONFIG_ATH5K is not set
 # CONFIG_ATH5K_PCI is not set
-CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_HW=y
-CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_COMMON=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K is not set
-CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC=y
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
-# CONFIG_CARL9170 is not set
+CONFIG_CARL9170=y
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
 # CONFIG_ATH6KL is not set
 # CONFIG_AR5523 is not set
 # CONFIG_WIL6210 is not set

resources/InstallResources/xfce-config/xflock4-xfce4-screensaver.patch

@@ -0,0 +1,13 @@
+diff --git a/usr/bin/xflock4 b/usr/bin/xflock4
+index d55cbf7..b7b28c6
+--- a/usr/bin/xflock4
++++ b/usr/bin/xflock4
+@@ -26,6 +26,7 @@ export PATH
+ 
+ # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+ for lock_cmd in \
++    "xfce4-screensaver-command --lock"\
+     "xscreensaver-command -lock" \
+     "light-locker-command --lock" \
+     "gnome-screensaver-command --lock" \
+

scripts/InstallScripts/InstallPackages.sh

@@ -43,7 +43,7 @@ DEBIAN_FRONTEND=noninteractive apt -t buster install -y firefox-esr || DEBIAN_FR
 # #install chromium from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite
 DEBIAN_FRONTEND=noninteractive apt -t buster install -y chromium || DEBIAN_FRONTEND=noninteractive apt install -y chromium
 
-[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice
+[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice xfce4-screensaver
 [ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt
 
 if [ "$DE" = "xfce" ]
@@ -60,6 +60,10 @@ then
   chmod 644 /etc/lightdm/icon.png
   cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/
 
+
+  #Patch xflock4 to support xfce-screensaver https://docs.xfce.org/apps/screensaver/faq
+  patch /usr/bin/xflock4 < $DIR/xfce-config/xflock4-xfce4-screensaver.patch
+
   #Copy in wallpapers
   rm /usr/share/images/desktop-base/default && cp $DIR/wallpapers/* /usr/share/images/desktop-base/
 

scripts/InstallScripts/UpgradeKernel.sh

@@ -26,13 +26,22 @@ BOOT_DEVICE=$(mount | head -n 1 | cut -d '2' -f 1)
 
 
 read -p "This will replace the kernel installed on the internal storage (EMMC) with the one on the booted USB drive or SD card and reboot when finished, do you want to continue? [Y/n]" -n 1 -r
+echo
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
     #disable dmesg, writing the partition map tries to write the the first gpt table, which is unmodifiable
     echo Writing kernel partition
     dd if="$BOOT_DEVICE"1 of=/dev/mmcblk2p1
-
+    echo Copying over ath9k module
-
+    mkdir -p /mnt/mmc
+    mount /dev/mmcblk2p2 /mnt/mmc
+    rm /mnt/mmc/lib/firmware/ath9k_htc/htc_9271-1.4.0.fw
+    install -D -m 644 /lib/firmware/ath9k_htc/htc_9271-1.4.0.fw /mnt/mmc/lib/firmware/ath9k_htc/htc_9271-1.4.0.fw
+    echo Copying over module information
+    rm -rf /mnt/mmc/lib/modules
+    install -d -D -m 755 /lib/modules /mnt/mmc/lib/modules
+    umount /mnt/mmc
+    echo You can now reboot
 fi
 
 echo Exiting

scripts/buildFilesystem.sh

@@ -172,7 +172,7 @@ chroot $outmnt apt install -y libinput-tools xdotool build-essential
 #Package is copied into /InstallResources/packages
 
 #Download the packages to be installed by Install.sh:
-chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice sudo pavucontrol-qt
+chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice sudo pavucontrol-qt xfce4-screensaver
 
 
 if [ "$PRAWNOS_SUITE" = "stretch" ]

scripts/injectKernelIntoFS.sh

@@ -60,7 +60,6 @@ mount -o noatime ${outdev}p2 $outmnt
 dd if=$build_resources/blank_kernel of=${outdev}p1 conv=notrunc
 dd if=build/linux-$KVER/vmlinux.kpart of=${outdev}p1 conv=notrunc
 make -C build/linux-$KVER ARCH=arm INSTALL_MOD_PATH=$outmnt modules_install
-rm -f $outmnt/lib/modules/3.14.0/{build,source}
 install -D -m 644 build/open-ath9k-htc-firmware/target_firmware/htc_9271.fw $outmnt/lib/firmware/ath9k_htc/htc_9271-1.4.0.fw
 
 umount -l $outmnt > /dev/null 2>&1