From ad932d5df8218d57bd21166475d44b1af42af2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 14 Sep 2018 09:20:08 +0200
Subject: [PATCH 1/2] root.sh: Don't use package list to determine if ssh keys
 are needed

Using the package list is a bad idea since the package might be a
dependency. Check for the binary instead.
---
 root.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.sh b/root.sh
index 0acacd3..a122d1c 100755
--- a/root.sh
+++ b/root.sh
@@ -166,7 +166,7 @@ function setup_journal()
 
 function setup_sshd()
 {
-    [[ "$packages" =~ "openssh-server" ]] || return
+    [ -x "${basedir}/usr/sbin/sshd" ] || return
     # Generate new host keys on first boot
     cp data/gen-sshd-host-keys "${basedir}/usr/local/bin/"
     cp data/sshd-host-keys.service "${basedir}/etc/systemd/system/"
-- 
GitLab


From 2a0436ca5a6895d12d6c3fc715c4eb3f8b260c93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Thu, 13 Sep 2018 12:42:32 +0200
Subject: [PATCH 2/2] Use meta packages

A first step to reduce the image build scripts
---
 conf/packages | 101 ++------------------------------------------------
 1 file changed, 4 insertions(+), 97 deletions(-)

diff --git a/conf/packages b/conf/packages
index f7e8d05..d373e56 100644
--- a/conf/packages
+++ b/conf/packages
@@ -1,100 +1,7 @@
-# Packages to install on all boards
-
-gui_packages="
-    libgl1-mesa-dri
-    libpam-systemd
-
-    libhandy-0.0-0
-    librem5-theme-default
-    libwlroots-examples
-    phosh
-    virtboard
-    weston
-
-    calls
-    epiphany-browser
-    evince
-    gnome-calendar
-    gnome-chess
-    gnome-contacts
-    gnome-control-center
-    gnome-maps
-    gnome-online-accounts
-    gnome-session
-    gnome-settings-daemon
-    gnome-terminal
-    gnome-tweaks
-    network-manager-gnome
-    xdg-desktop-portal-gtk
-"
-
-gui_dev_packages="
-    build-essential
-    libcap-dev
-    libdrm-dev
-    libegl1-mesa-dev
-    libgbm-dev
-    libgles2-mesa-dev
-    libinput-dev
-    libsystemd-dev
-    libwayland-dev
-    libxcb1-dev
-    libxcb-composite0-dev
-    libxcb-icccm4-dev
-    libxcb-image0-dev
-    libxcb-render0-dev
-    libxcb-xfixes0-dev
-    libxkbcommon-dev
-    meson
-
-    libgnome-desktop-3-dev
-    libgtk-3-dev
-    libpixman-1-dev
-"
-
-dev_packages="
-    alsa-utils
-    bash-completion
-    dconf-editor
-    device-tree-compiler
-    edid-decode
-    evtest
-    gdb
-    git
-    i2c-tools
-    kbd
-    lsof
-    net-tools
-    openssh-client
-    openssh-server
-    read-edid
-    screen
-    strace
-    systemd-coredump
-    u-boot-tools
-    unzip
-    vim-gtk3
-    wireless-tools
-    ${gui_dev_packages}
-"
-
-wwan_packages="
-    libqmi-utils
-    modemmanager
-    libmbim-utils
-    usb-modeswitch
-"
+# Packages to install on all dev boards
 
 packages="
-    ca-certificates
-    cloud-initramfs-growroot
-    dosfstools
-    flatpak
-    libnss-systemd
-    locales
-    lvm2
-    usbutils
-    ${gui_packages}
-    ${dev_packages}
-    ${wwan_packages}
+    librem5-gnome
+    librem5-dev-tools
+    librem5-gnome-dev
 "
-- 
GitLab