From a545b0542dfed5e209014ffb25cbea3c33b557c0 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@cryptonomic.net>
Date: Sun, 28 Feb 2021 17:23:41 -0500
Subject: rootfs improvements

---
 rootfs/build-deps.yaml     |  5 +++--
 rootfs/samizdat-wip.yaml   | 26 ++++++--------------------
 rootfs/samizdat.patch.yaml |  1 +
 rootfs/samizdat.yaml       | 31 ++++++++++++++++++++-----------
 4 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/rootfs/build-deps.yaml b/rootfs/build-deps.yaml
index c4ca5af..18cf734 100644
--- a/rootfs/build-deps.yaml
+++ b/rootfs/build-deps.yaml
@@ -1,4 +1,4 @@
-parent: samizdat-wip
+parent: kernel
 # unpack-only: true
 packages:
 - libncurses5-dev
@@ -42,8 +42,9 @@ packages:
 # - pulseaudio-module-jack
 # - pulseaudio-utils
 - qemu-system-x86
-- qemu-system-gui
+#- qemu-system-gui
 #- ssh
 #- ssh-askpass-gnome
 - strace
+- sudo
 - uml-utilities
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml
index 211b854..710480d 100644
--- a/rootfs/samizdat-wip.yaml
+++ b/rootfs/samizdat-wip.yaml
@@ -1,22 +1,15 @@
-parent: kernel
-# unpack-only: true
-# chroot-commands:
-# - "DEBIAN_FRONTEND=noninteractive dpkg --no-triggers --configure -a"
-
+parent: build-deps
 packages:
-# - ../openssh-client_8.3p1-1_$(debarch).deb
-# - ../openssh-server_8.3p1-1_$(debarch).deb
-# - ../openssh-sftp-server_8.3p1-1_$(debarch).deb
-# # ../openssh-tests_8.3p1-1_$(debarch).deb
-# - ../ssh_8.3p1-1_all.deb
-# - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb
 
-- dnsutils
 - cron
-# - sshfs
+- dnsutils
 - emacs25
 - gpm
+- net-tools
 - parted
+- procps
+- sshfs
+- wireless-tools
 
 # these are dependencies of 'axis':
 - 'libsdl-ttf2.0-0'
@@ -35,15 +28,8 @@ packages:
 - 'xserver-xorg-input-wacom'
 
 binaries:
-- kiki
-- cokiki
-- hosts
-- selfstrap
 - stack
-
 binaries-optional:
-- dhtd
-- dht
 - rustup
 
 skel-files-optional:
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml
index 6240d53..cba33ac 100644
--- a/rootfs/samizdat.patch.yaml
+++ b/rootfs/samizdat.patch.yaml
@@ -5,6 +5,7 @@ binaries:
 - './samizdat-update-apt-cache.sh'
 - './samizdat-patch-root.sh'
 - './samizdat-hostname.sh'
+- '/usr/bin/selfpublish.sh'
 chroot-commands:
 - "/usr/local/bin/samizdat-update-apt-cache.sh"
 - "/usr/local/bin/samizdat-patch-root.sh"
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index 3bbedc3..cd3718e 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -1,4 +1,4 @@
-parent: build-deps
+parent: samizdat-wip
 unpack-only: false
 binaries:
 - samizdat-diff-root
@@ -6,21 +6,31 @@ binaries:
 - kiki
 - cokiki
 - hosts
+- selfstrap
+binaries-optional:
+- dhtd
+- dht
 packages:
-- sudo
-- dbus-x11
 - linux-image-$(kver)-$(karch)
+
+- libfido2-dev
+- ../ssh_8.4p1-2_all.deb
 - ../openssh-client_8.4p1-2_$(debarch).deb
 - ../openssh-server_8.4p1-2_$(debarch).deb
 - ../openssh-sftp-server_8.4p1-2_$(debarch).deb
-#- ../openssh-tests_8.4p1-2_$(debarch).deb
-#- putty-tools
-- ../ssh_8.4p1-2_all.deb
 - ../ssh-askpass-gnome_8.4p1-2_$(debarch).deb
-- sshfs
-- procps
-- net-tools
-- wireless-tools
+
+# - ../openssh-tests_8.4p1-2_$(debarch).deb
+# - putty-tools
+# - python3-twisted
+
+# - ../openssh/dh-runit_2.8.11_all.deb
+# - ../openssh/fido2-tools_1.5.0-2_amd64.deb
+# - ../openssh/libfido2-1_1.5.0-2_amd64.deb
+# - ../openssh/libfido2-dev_1.5.0-2_amd64.deb
+# - ../openssh/runit-helper_2.8.11_all.deb
+
+
 unit-files:
 - rc-local.service
 
@@ -32,7 +42,6 @@ chroot-commands:
 - "useradd d -G sudo -m -p '' -s /bin/bash"
 - "echo '#!/bin/sh' > /etc/rc.local && chmod +x /etc/rc.local"
 - "echo loginctl enable-linger u >> /etc/rc.local"
-- "dpkg --configure sudo || true"
 - "touch /var/lib/sudo/lectured/u"
 - "mkdir -p /etc/sudoers.d; echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"
 
-- 
cgit v1.2.3