g/PrawnOS-nonfree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed how disable_ertm gets set, previous fix didn't work

Browse Source 
Also added bluetooth package
This commit is contained in:
Hal Emmerich 2019-12-02 20:39:48 -06:00
parent 742a3b8924
commit 6bdd2abbaf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/InstallScripts/InstallPackages.sh
View File

@ -34,7 +34,7 @@ done
dpkg-reconfigure tzdata dpkg-reconfigure tzdata
#Install shared packages #Install shared packages
DEBIAN_FRONTEND=noninteractive apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-cli dconf-editor sudo dtrx emacs DEBIAN_FRONTEND=noninteractive apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-cli dconf-editor sudo dtrx emacs sysfsutils bluetooth
DEBIAN_FRONTEND=noninteractive apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome DEBIAN_FRONTEND=noninteractive apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome
# #install firefox from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite # #install firefox from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite
@ -60,6 +60,9 @@ patch /usr/share/X11/xkb/rules/evdev.xml < $DIR/xkb/rules/evdev.xml.chromebook.p
cp $DIR/xkb/keyboard /etc/default/keyboard cp $DIR/xkb/keyboard /etc/default/keyboard
#disable ertm for csr8510 bluetooth, issue #117
echo "module/bluetooth/parameters/disable_ertm = 1" > /etc/sysfs.conf
if [ "$DE" = "xfce" ] if [ "$DE" = "xfce" ]
then then
# remove light-locker, as it is broken on this machine. See issue https://github.com/SolidHal/PrawnOS/issues/56#issuecomment-504681175 # remove light-locker, as it is broken on this machine. See issue https://github.com/SolidHal/PrawnOS/issues/56#issuecomment-504681175
@ -175,7 +178,7 @@ do
done done
done done
usermod -a -G sudo,netdev,input,video $username usermod -a -G sudo,netdev,input,video,bluetooth $username
dmesg -E dmesg -E

5
scripts/buildFilesystem.sh
View File

@ -154,9 +154,6 @@ chroot $outmnt apt install -y udev kmod net-tools inetutils-ping traceroute ipro
cp -f $build_resources/external_fstab $outmnt/etc/fstab cp -f $build_resources/external_fstab $outmnt/etc/fstab
chmod 644 /etc/fstab chmod 644 /etc/fstab
#disable ertm for csr8510 bluetooth, issue #117
echo "options bluetooth disable_ertm=Y" > $outmnt/etc/modprobe.d/bluetooth.conf
#Cleanup to reduce install size #Cleanup to reduce install size
chroot $outmnt apt-get autoremove --purge chroot $outmnt apt-get autoremove --purge
chroot $outmnt apt-get clean chroot $outmnt apt-get clean
@ -168,7 +165,7 @@ chroot $outmnt apt install -y libinput-tools xdotool build-essential
chroot $outmnt apt-get install -y -t unstable -d xsecurelock chroot $outmnt apt-get install -y -t unstable -d xsecurelock
#Download the packages to be installed by Install.sh: #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 emacs accountsservice sudo pavucontrol-qt papirus-icon-theme 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 emacs accountsservice sudo pavucontrol-qt papirus-icon-theme sysfsutils bluetooth
chroot $outmnt apt-get install -d -y firefox-esr chroot $outmnt apt-get install -d -y firefox-esr
# grab chromium as well, since sound is still broken in firefox for some media # grab chromium as well, since sound is still broken in firefox for some media