Merge branch 'master' of github.com:SolidHal/PrawnOS

This commit is contained in:
Hal Emmerich 2019-10-06 12:36:24 -05:00
commit afaf80f088
2 changed files with 5 additions and 8 deletions

View File

@ -48,12 +48,9 @@ This is the only build enviroment that is supported.
These packages are required:
```
apt install --no-install-recommends --no-install-suggests \
parted cgpt \
git gawk device-tree-compiler vboot-kernel-utils gcc-arm-none-eabi \
u-boot-tools \
gcc make libc-dev wget g++ cmake \
binfmt-support qemu-user-static debootstrap \
apt install --no-install-recommends --no-install-suggests parted cgpt git \
gawk device-tree-compiler vboot-kernel-utils gcc-arm-none-eabi u-boot-tools \
gcc make libc-dev wget g++ cmake binfmt-support qemu-user-static debootstrap \
lzip libssl-dev libncurses-dev flex bison sudo patch bc
```

View File

@ -164,9 +164,9 @@ chroot $outmnt apt-get clean
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 -t unstable -d xsecurelock
#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
if [ "$PRAWNOS_SUITE" = "stretch" ]