diff options
author | Andrew Cady <d@cryptonomic.net> | 2021-02-28 17:23:41 -0500 |
---|---|---|
committer | Andrew Cady <d@cryptonomic.net> | 2021-02-28 17:23:41 -0500 |
commit | a545b0542dfed5e209014ffb25cbea3c33b557c0 (patch) | |
tree | 32fe197985e8a865bf94ac08782c24d794bac4da /rootfs | |
parent | 46392845e24a890cd6770dbf41fe1d76d5d74f4d (diff) |
rootfs improvements
Diffstat (limited to 'rootfs')
-rw-r--r-- | rootfs/build-deps.yaml | 5 | ||||
-rw-r--r-- | rootfs/samizdat-wip.yaml | 26 | ||||
-rw-r--r-- | rootfs/samizdat.patch.yaml | 1 | ||||
-rw-r--r-- | 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 @@ | |||
1 | parent: samizdat-wip | 1 | parent: kernel |
2 | # unpack-only: true | 2 | # unpack-only: true |
3 | packages: | 3 | packages: |
4 | - libncurses5-dev | 4 | - libncurses5-dev |
@@ -42,8 +42,9 @@ packages: | |||
42 | # - pulseaudio-module-jack | 42 | # - pulseaudio-module-jack |
43 | # - pulseaudio-utils | 43 | # - pulseaudio-utils |
44 | - qemu-system-x86 | 44 | - qemu-system-x86 |
45 | - qemu-system-gui | 45 | #- qemu-system-gui |
46 | #- ssh | 46 | #- ssh |
47 | #- ssh-askpass-gnome | 47 | #- ssh-askpass-gnome |
48 | - strace | 48 | - strace |
49 | - sudo | ||
49 | - uml-utilities | 50 | - 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 @@ | |||
1 | parent: kernel | 1 | parent: build-deps |
2 | # unpack-only: true | ||
3 | # chroot-commands: | ||
4 | # - "DEBIAN_FRONTEND=noninteractive dpkg --no-triggers --configure -a" | ||
5 | |||
6 | packages: | 2 | packages: |
7 | # - ../openssh-client_8.3p1-1_$(debarch).deb | ||
8 | # - ../openssh-server_8.3p1-1_$(debarch).deb | ||
9 | # - ../openssh-sftp-server_8.3p1-1_$(debarch).deb | ||
10 | # # ../openssh-tests_8.3p1-1_$(debarch).deb | ||
11 | # - ../ssh_8.3p1-1_all.deb | ||
12 | # - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb | ||
13 | 3 | ||
14 | - dnsutils | ||
15 | - cron | 4 | - cron |
16 | # - sshfs | 5 | - dnsutils |
17 | - emacs25 | 6 | - emacs25 |
18 | - gpm | 7 | - gpm |
8 | - net-tools | ||
19 | - parted | 9 | - parted |
10 | - procps | ||
11 | - sshfs | ||
12 | - wireless-tools | ||
20 | 13 | ||
21 | # these are dependencies of 'axis': | 14 | # these are dependencies of 'axis': |
22 | - 'libsdl-ttf2.0-0' | 15 | - 'libsdl-ttf2.0-0' |
@@ -35,15 +28,8 @@ packages: | |||
35 | - 'xserver-xorg-input-wacom' | 28 | - 'xserver-xorg-input-wacom' |
36 | 29 | ||
37 | binaries: | 30 | binaries: |
38 | - kiki | ||
39 | - cokiki | ||
40 | - hosts | ||
41 | - selfstrap | ||
42 | - stack | 31 | - stack |
43 | |||
44 | binaries-optional: | 32 | binaries-optional: |
45 | - dhtd | ||
46 | - dht | ||
47 | - rustup | 33 | - rustup |
48 | 34 | ||
49 | skel-files-optional: | 35 | 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: | |||
5 | - './samizdat-update-apt-cache.sh' | 5 | - './samizdat-update-apt-cache.sh' |
6 | - './samizdat-patch-root.sh' | 6 | - './samizdat-patch-root.sh' |
7 | - './samizdat-hostname.sh' | 7 | - './samizdat-hostname.sh' |
8 | - '/usr/bin/selfpublish.sh' | ||
8 | chroot-commands: | 9 | chroot-commands: |
9 | - "/usr/local/bin/samizdat-update-apt-cache.sh" | 10 | - "/usr/local/bin/samizdat-update-apt-cache.sh" |
10 | - "/usr/local/bin/samizdat-patch-root.sh" | 11 | - "/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 @@ | |||
1 | parent: build-deps | 1 | parent: samizdat-wip |
2 | unpack-only: false | 2 | unpack-only: false |
3 | binaries: | 3 | binaries: |
4 | - samizdat-diff-root | 4 | - samizdat-diff-root |
@@ -6,21 +6,31 @@ binaries: | |||
6 | - kiki | 6 | - kiki |
7 | - cokiki | 7 | - cokiki |
8 | - hosts | 8 | - hosts |
9 | - selfstrap | ||
10 | binaries-optional: | ||
11 | - dhtd | ||
12 | - dht | ||
9 | packages: | 13 | packages: |
10 | - sudo | ||
11 | - dbus-x11 | ||
12 | - linux-image-$(kver)-$(karch) | 14 | - linux-image-$(kver)-$(karch) |
15 | |||
16 | - libfido2-dev | ||
17 | - ../ssh_8.4p1-2_all.deb | ||
13 | - ../openssh-client_8.4p1-2_$(debarch).deb | 18 | - ../openssh-client_8.4p1-2_$(debarch).deb |
14 | - ../openssh-server_8.4p1-2_$(debarch).deb | 19 | - ../openssh-server_8.4p1-2_$(debarch).deb |
15 | - ../openssh-sftp-server_8.4p1-2_$(debarch).deb | 20 | - ../openssh-sftp-server_8.4p1-2_$(debarch).deb |
16 | #- ../openssh-tests_8.4p1-2_$(debarch).deb | ||
17 | #- putty-tools | ||
18 | - ../ssh_8.4p1-2_all.deb | ||
19 | - ../ssh-askpass-gnome_8.4p1-2_$(debarch).deb | 21 | - ../ssh-askpass-gnome_8.4p1-2_$(debarch).deb |
20 | - sshfs | 22 | |
21 | - procps | 23 | # - ../openssh-tests_8.4p1-2_$(debarch).deb |
22 | - net-tools | 24 | # - putty-tools |
23 | - wireless-tools | 25 | # - python3-twisted |
26 | |||
27 | # - ../openssh/dh-runit_2.8.11_all.deb | ||
28 | # - ../openssh/fido2-tools_1.5.0-2_amd64.deb | ||
29 | # - ../openssh/libfido2-1_1.5.0-2_amd64.deb | ||
30 | # - ../openssh/libfido2-dev_1.5.0-2_amd64.deb | ||
31 | # - ../openssh/runit-helper_2.8.11_all.deb | ||
32 | |||
33 | |||
24 | unit-files: | 34 | unit-files: |
25 | - rc-local.service | 35 | - rc-local.service |
26 | 36 | ||
@@ -32,7 +42,6 @@ chroot-commands: | |||
32 | - "useradd d -G sudo -m -p '' -s /bin/bash" | 42 | - "useradd d -G sudo -m -p '' -s /bin/bash" |
33 | - "echo '#!/bin/sh' > /etc/rc.local && chmod +x /etc/rc.local" | 43 | - "echo '#!/bin/sh' > /etc/rc.local && chmod +x /etc/rc.local" |
34 | - "echo loginctl enable-linger u >> /etc/rc.local" | 44 | - "echo loginctl enable-linger u >> /etc/rc.local" |
35 | - "dpkg --configure sudo || true" | ||
36 | - "touch /var/lib/sudo/lectured/u" | 45 | - "touch /var/lib/sudo/lectured/u" |
37 | - "mkdir -p /etc/sudoers.d; echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u" | 46 | - "mkdir -p /etc/sudoers.d; echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u" |
38 | 47 | ||