From 820c999cca07c0a88f79f4f1b6a1ccb1624c2603 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Thu, 29 Aug 2019 09:43:38 -0500 Subject: [PATCH] Fix building in screensaver package --- scripts/InstallScripts/InstallPackages.sh | 2 +- scripts/buildFilesystem.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index ca7dac6..1d5bd5a 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/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 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 if [ "$DE" = "xfce" ] diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index 8eddc2c..8811f43 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -167,7 +167,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 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" ] @@ -188,6 +188,8 @@ fi # #grab firefox from buster or higher, since stretch is broken 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 rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests