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

Fix building in screensaver package

Browse Source
This commit is contained in:
Hal Emmerich 2019-08-29 09:43:38 -05:00
parent 529c8ece42
commit 820c999cca
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/InstallScripts/InstallPackages.sh
View File

@ -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 # #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 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 xfce4-screensaver [ "$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 && apt install -t sid -y libxfce4ui-2-0 xfce4-screensaver
[ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt [ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt
if [ "$DE" = "xfce" ] if [ "$DE" = "xfce" ]

4
scripts/buildFilesystem.sh
View File

@ -167,7 +167,7 @@ chroot $outmnt apt install -y libinput-tools xdotool build-essential
#Package is copied into /InstallResources/packages #Package is copied into /InstallResources/packages
#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 emacs25 accountsservice sudo pavucontrol-qt xfce4-screensaver 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" ] if [ "$PRAWNOS_SUITE" = "stretch" ]
@ -188,6 +188,8 @@ fi
# #grab firefox from buster or higher, since stretch is broken # #grab firefox from buster or higher, since stretch is broken
chroot $outmnt apt-get -t $FIREFOX_SUITE install -d -y firefox-esr chroot $outmnt apt-get -t $FIREFOX_SUITE install -d -y firefox-esr
# install xfce-screensaver from sid
chroot $outmnt apt-get -t sid install -d -y xfce4-screensaver libxfce4ui-2-0
#Cleanup hosts #Cleanup hosts
rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests