diff options
author | Andrew Cady <d@jerkface.net> | 2020-10-12 14:26:33 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2020-10-12 14:26:37 -0400 |
commit | 1592a5000af5a6ba48d644a59dd751f1a823dec1 (patch) | |
tree | 65bc78d94ddac56b028aa7fa1be139e762533088 /rootfs | |
parent | 79b0ac15fc28189a9b4a00016cc889f5a189eae8 (diff) |
rootfs is building
sort of.
manual intervention was employed.
Diffstat (limited to 'rootfs')
-rw-r--r-- | rootfs/Makefile | 5 | ||||
-rw-r--r-- | rootfs/build-deps.yaml | 9 | ||||
-rw-r--r-- | rootfs/samizdat-wip.yaml | 22 | ||||
-rw-r--r-- | rootfs/samizdat.patch.yaml | 4 | ||||
-rw-r--r-- | rootfs/samizdat.yaml | 3 |
5 files changed, 26 insertions, 17 deletions
diff --git a/rootfs/Makefile b/rootfs/Makefile index 9e4e15a..7bb9619 100644 --- a/rootfs/Makefile +++ b/rootfs/Makefile | |||
@@ -14,5 +14,6 @@ all: rootfs $(ifneq $(patchfs),,patchfs) | |||
14 | 14 | ||
15 | rootfs $(rootfs): | 15 | rootfs $(rootfs): |
16 | $(sudo) $(fsmgr) build $(rootfs) | 16 | $(sudo) $(fsmgr) build $(rootfs) |
17 | patchfs $(patchfs): $(rootfs) | 17 | |
18 | $(sudo) $(fsmgr) build $(patchfs) | 18 | patchfs $(patchfs): |
19 | $(sudo) REWRITE_SOURCES_LIST=y $(fsmgr) build $(patchfs) | ||
diff --git a/rootfs/build-deps.yaml b/rootfs/build-deps.yaml index cf36bab..3e41e63 100644 --- a/rootfs/build-deps.yaml +++ b/rootfs/build-deps.yaml | |||
@@ -1,5 +1,5 @@ | |||
1 | parent: samizdat-wip | 1 | parent: samizdat-wip |
2 | unpack-only: false | 2 | # unpack-only: true |
3 | packages: | 3 | packages: |
4 | - libncurses5-dev | 4 | - libncurses5-dev |
5 | - kbd | 5 | - kbd |
@@ -38,12 +38,11 @@ packages: | |||
38 | #- openssh-sftp-server | 38 | #- openssh-sftp-server |
39 | - parted | 39 | - parted |
40 | - pgpdump | 40 | - pgpdump |
41 | - pulseaudio-module-bluetooth | 41 | # - pulseaudio-module-bluetooth |
42 | - pulseaudio-module-jack | 42 | # - pulseaudio-module-jack |
43 | - pulseaudio-utils | 43 | # - pulseaudio-utils |
44 | - qemu-system-x86 | 44 | - qemu-system-x86 |
45 | #- ssh | 45 | #- ssh |
46 | #- ssh-askpass-gnome | 46 | #- ssh-askpass-gnome |
47 | - sshfs | ||
48 | - strace | 47 | - strace |
49 | - uml-utilities | 48 | - uml-utilities |
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml index afb92ea..211b854 100644 --- a/rootfs/samizdat-wip.yaml +++ b/rootfs/samizdat-wip.yaml | |||
@@ -1,16 +1,19 @@ | |||
1 | parent: kernel | 1 | parent: kernel |
2 | unpack-only: false | 2 | # unpack-only: true |
3 | # chroot-commands: | ||
4 | # - "DEBIAN_FRONTEND=noninteractive dpkg --no-triggers --configure -a" | ||
5 | |||
3 | packages: | 6 | packages: |
4 | - ../openssh-client_8.3p1-1_$(debarch).deb | 7 | # - ../openssh-client_8.3p1-1_$(debarch).deb |
5 | - ../openssh-server_8.3p1-1_$(debarch).deb | 8 | # - ../openssh-server_8.3p1-1_$(debarch).deb |
6 | - ../openssh-sftp-server_8.3p1-1_$(debarch).deb | 9 | # - ../openssh-sftp-server_8.3p1-1_$(debarch).deb |
7 | # ../openssh-tests_8.3p1-1_$(debarch).deb | 10 | # # ../openssh-tests_8.3p1-1_$(debarch).deb |
8 | - ../ssh_8.3p1-1_all.deb | 11 | # - ../ssh_8.3p1-1_all.deb |
9 | - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb | 12 | # - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb |
10 | 13 | ||
11 | - dnsutils | 14 | - dnsutils |
12 | - cron | 15 | - cron |
13 | - sshfs | 16 | # - sshfs |
14 | - emacs25 | 17 | - emacs25 |
15 | - gpm | 18 | - gpm |
16 | - parted | 19 | - parted |
@@ -27,7 +30,7 @@ packages: | |||
27 | - 'jackd' # jack-plumbing | 30 | - 'jackd' # jack-plumbing |
28 | - 'pulseaudio' # pavol | 31 | - 'pulseaudio' # pavol |
29 | - 'pulseaudio-module-jack' | 32 | - 'pulseaudio-module-jack' |
30 | - 'pulseaudio-module-bluetooth' | 33 | # - 'pulseaudio-module-bluetooth' |
31 | 34 | ||
32 | - 'xserver-xorg-input-wacom' | 35 | - 'xserver-xorg-input-wacom' |
33 | 36 | ||
@@ -54,6 +57,7 @@ skel-files-optional: | |||
54 | - '.vimrc' | 57 | - '.vimrc' |
55 | - '.xbindkeysrc' | 58 | - '.xbindkeysrc' |
56 | - '.xinitrc' | 59 | - '.xinitrc' |
60 | |||
57 | - '.Xresources' | 61 | - '.Xresources' |
58 | 62 | ||
59 | # keymap control/recue | 63 | # keymap control/recue |
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml index c9f3874..2067801 100644 --- a/rootfs/samizdat.patch.yaml +++ b/rootfs/samizdat.patch.yaml | |||
@@ -1,5 +1,5 @@ | |||
1 | parent: samizdat | 1 | parent: samizdat |
2 | seedme: 150000000 | 2 | seedme: 210000000 |
3 | apt-update: true | 3 | apt-update: true |
4 | binaries: | 4 | binaries: |
5 | - './samizdat-update-apt-cache.sh' | 5 | - './samizdat-update-apt-cache.sh' |
@@ -10,10 +10,12 @@ chroot-commands: | |||
10 | - "/usr/local/bin/samizdat-patch-root.sh" | 10 | - "/usr/local/bin/samizdat-patch-root.sh" |
11 | - "/usr/local/bin/samizdat-hostname.sh" | 11 | - "/usr/local/bin/samizdat-hostname.sh" |
12 | packages: | 12 | packages: |
13 | - linux-image-$(kver)-$(karch) | ||
13 | - ../openssh-client_8.3p1-1_$(debarch).deb | 14 | - ../openssh-client_8.3p1-1_$(debarch).deb |
14 | - ../openssh-server_8.3p1-1_$(debarch).deb | 15 | - ../openssh-server_8.3p1-1_$(debarch).deb |
15 | - ../openssh-sftp-server_8.3p1-1_$(debarch).deb | 16 | - ../openssh-sftp-server_8.3p1-1_$(debarch).deb |
16 | # ../openssh-tests_8.3p1-1_$(debarch).deb | 17 | # ../openssh-tests_8.3p1-1_$(debarch).deb |
17 | - ../ssh_8.3p1-1_all.deb | 18 | - ../ssh_8.3p1-1_all.deb |
18 | - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb | 19 | - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb |
20 | - sshfs | ||
19 | 21 | ||
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml index b4a7008..cf82ce8 100644 --- a/rootfs/samizdat.yaml +++ b/rootfs/samizdat.yaml | |||
@@ -14,7 +14,10 @@ skel-files: [] | |||
14 | 14 | ||
15 | chroot-commands: | 15 | chroot-commands: |
16 | - "useradd u -G sudo -m -p '' -s /bin/bash" | 16 | - "useradd u -G sudo -m -p '' -s /bin/bash" |
17 | # - 'loginctl enable-linger u' | ||
18 | - "dpkg --configure sudo" | ||
17 | - "touch /var/lib/sudo/lectured/u" | 19 | - "touch /var/lib/sudo/lectured/u" |
18 | - "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u" | 20 | - "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u" |
21 | |||
19 | - "systemctl enable debug-shell" | 22 | - "systemctl enable debug-shell" |
20 | - "DEBIAN_FRONTEND=noninteractive apt-get -f install; true" | 23 | - "DEBIAN_FRONTEND=noninteractive apt-get -f install; true" |