From f3f10db8d5827aeace3d3e79f63d95e993e41278 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Thu, 26 Sep 2019 10:27:54 -0700 Subject: [PATCH 1/2] Fixup Build dependency formatting --- README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1a2a562..9fbdd4c 100644 --- a/README.md +++ b/README.md @@ -47,13 +47,10 @@ 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 \ - lzip libssl-dev libncurses-dev flex bison sudo patch bc + 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 ``` ## Build From aba6a5138fbac7b0de658ee9957a69327ee3c3ec Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Sun, 29 Sep 2019 20:28:39 -0500 Subject: [PATCH 2/2] Must grab xsecurelock from sid --- 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 a8f50d0..06caba0 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -57,7 +57,7 @@ then # is told to sleep at lid close, and activate lock # gnome-screensaver shows the desktop for a fraction of a second at wakeup # xscreensaver works as well, if you prefer that but is less simple - apt install xsecurelock + apt install -y -t unstable xsecurelock #Install packages not in an apt repo dpkg -i $DIR/xfce-themes/* diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index fb5a40c..ef4baa2 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -166,8 +166,10 @@ chroot $outmnt apt-get clean chroot $outmnt apt install -y libinput-tools xdotool build-essential #Package is copied into /InstallResources/packages +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 xsecurelock +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" ]