Fix install packages script so xsession starts properly

Removing dwc2 patch, as shouldn't be required. Same with the exports.
This commit is contained in:
SolidHal 2018-09-17 17:58:10 -05:00
parent 0d193eb6fd
commit afc1a76eea
3 changed files with 7 additions and 10 deletions

View File

@ -22,17 +22,14 @@ apt install -y wicd-daemon wicd wicd-curses wicd-gtk
#Install packages not in an apt repo
[ "$DE" = "xfce" ] && dpkg -i $DIR/xfce-themes/*
#Copy in xfce4 default settings
[ "$DE" = "xfce" ] && rm /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml && rm /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
[ "$DE" = "xfce" ] && cp $DIR/xfce-config/xfce-perchannel-xml/* /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
[ "$DE" = "xfce" ] && cp $DIR/xfce-config/panel/* /etc/xdg/xfce4/panel/
[ "$DE" = "xfce" ] && cp -f $DIR/xfce-config/xfce-perchannel-xml/* /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
[ "$DE" = "xfce" ] && cp -f $DIR/xfce-config/panel/* /etc/xdg/xfce4/panel/
#Copy in lightdm/light greeter settings
[ "$DE" = "xfce" ] && rm /etc/lightdm/lightdm-gtk-greeter.conf
[ "$DE" = "xfce" ] && cp $DIR/xfce-config/lightdm/* /etc/lightdm/
[ "$DE" = "xfce" ] && cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/
#Copy in wallpapers
[ "$DE" = "xfce" ] && rm /usr/share/images/desktop-base/default && cp $DIR/wallpapers/* /usr/share/images/desktop-base/
#Make plank autostart
[ "$DE" = "xfce" ] && mkdir -p /etc/xdg/autostart/
[ "$DE" = "xfce" ] && cp $DIR/xfce-config/plank/plank.desktop /etc/xdg/autostart/

View File

@ -63,9 +63,9 @@ create_image() {
create_image PrawnOS-Alpha-c201-libre-2GB.img $outdev 50M 40 $outmnt
# install Debian on it
export LC_ALL="en_US.UTF-8" #Change this as necessary if not US
export LANGUAGE="en_US.UTF-8"
export LANG="en_US.UTF-8"
# export LC_ALL="en_US.UTF-8" #Change this as necessary if not US
# export LANGUAGE="en_US.UTF-8"
# export LANG="en_US.UTF-8"
export DEBIAN_FRONTEND=noninteractive
qemu-debootstrap --arch armhf stretch --include locales,init --keyring=$build_resources/debian-archive-keyring.gpg $outmnt http://deb.debian.org/debian
chroot $outmnt passwd -d root

View File

@ -19,7 +19,7 @@ cd linux-$KVER
make clean
make mrproper
#Apply the usb and mmc patches if unapplied
[ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/*.patch; do patch -p1 < $i; done
# [ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/*.patch; do patch -p1 < $i; done
[ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/DTS/*.patch; do patch -p1 < $i; done
[ "$FRESH" = true ] && for i in $RESOURCES/patches-tested/kernel/*.patch; do patch -p1 < $i; done
#Apply all of the rockMyy patches that make sense