diff options
author | Andrew Cady <d@jerkface.net> | 2019-06-19 21:59:20 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-06-19 21:59:20 -0400 |
commit | cba0669ce3c697f845e8ce366e61c78179246251 (patch) | |
tree | 207f08dff0bc997f5fb7af7a63f91ff3e6a7d362 | |
parent | ddd28e45d507665ffd89b35e8c759b6add7686a6 (diff) |
move fsmgr rootfs config into this repo
-rw-r--r-- | Makefile | 5 | ||||
m--------- | fsmgr | 0 | ||||
-rw-r--r-- | rootfs/Makefile | 5 | ||||
-rw-r--r-- | rootfs/filesystems.yaml | 11 | ||||
-rw-r--r-- | rootfs/firmware.dat | 19 | ||||
-rw-r--r-- | rootfs/firmware.yaml | 18 | ||||
-rw-r--r-- | rootfs/kernel.yaml | 15 | ||||
-rw-r--r-- | rootfs/local.dat | 26 | ||||
-rw-r--r-- | rootfs/local.yaml | 2 | ||||
-rw-r--r-- | rootfs/network-manager.yaml | 23 | ||||
-rw-r--r-- | rootfs/samizdat-deps.yaml | 22 | ||||
-rw-r--r-- | rootfs/samizdat-wip.yaml | 91 | ||||
-rw-r--r-- | rootfs/samizdat-xorg-extras.yaml | 15 | ||||
-rw-r--r-- | rootfs/samizdat-xorg.yaml | 10 | ||||
-rw-r--r-- | rootfs/samizdat.yaml | 11 | ||||
-rw-r--r-- | rootfs/useful.yaml | 9 |
16 files changed, 279 insertions, 3 deletions
@@ -47,10 +47,9 @@ else | |||
47 | ln -sf /var/cache/kiki/config/tor/hostname ${instdir}/etc/hostname | 47 | ln -sf /var/cache/kiki/config/tor/hostname ${instdir}/etc/hostname |
48 | endif | 48 | endif |
49 | 49 | ||
50 | fsmgr := $(shell which fsmgr) | 50 | .PHONY: rootfs |
51 | |||
52 | rootfs: | 51 | rootfs: |
53 | cd fsmgr/samizdat && sudo $(fsmgr) build samizdat | 52 | make -C rootfs |
54 | 53 | ||
55 | boot: rootfs | 54 | boot: rootfs |
56 | sudo qemu.sh | 55 | sudo qemu.sh |
diff --git a/fsmgr b/fsmgr | |||
Subproject 020b7f993caaa963934062fba7e20ab96e4c13d | Subproject 150c66fef4fafe04783144989dd8edca614380b | ||
diff --git a/rootfs/Makefile b/rootfs/Makefile new file mode 100644 index 0000000..8ddebcf --- /dev/null +++ b/rootfs/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | fsmgr := $(shell which fsmgr) | ||
2 | sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo) | ||
3 | |||
4 | all: | ||
5 | $(sudo) $(fsmgr) build samizdat | ||
diff --git a/rootfs/filesystems.yaml b/rootfs/filesystems.yaml new file mode 100644 index 0000000..1a6b9cb --- /dev/null +++ b/rootfs/filesystems.yaml | |||
@@ -0,0 +1,11 @@ | |||
1 | parent: useful | ||
2 | packages: | ||
3 | - btrfs-progs | ||
4 | - cryptsetup-bin | ||
5 | - hfsprogs | ||
6 | - mdadm | ||
7 | - nbd-client | ||
8 | - ntfs-3g | ||
9 | - grub-pc | ||
10 | - isolinux | ||
11 | - initramfs-tools | ||
diff --git a/rootfs/firmware.dat b/rootfs/firmware.dat new file mode 100644 index 0000000..1d86852 --- /dev/null +++ b/rootfs/firmware.dat | |||
@@ -0,0 +1,19 @@ | |||
1 | Name: firmware-ipw2x00/license/accepted | ||
2 | Template: firmware-ipw2x00/license/accepted | ||
3 | Owners: firmware-ipw2x00 | ||
4 | |||
5 | Name: firmware-ipw2x00/license/error | ||
6 | Template: firmware-ipw2x00/license/error | ||
7 | Owners: firmware-ipw2x00 | ||
8 | |||
9 | Name: b43-fwcutter/install-unconditional | ||
10 | Template: b43-fwcutter/install-unconditional | ||
11 | Value: true | ||
12 | Owners: b43-fwcutter | ||
13 | |||
14 | Name: firmware-ipw2x00/license/accepted | ||
15 | Template: firmware-ipw2x00/license/accepted | ||
16 | Value: true | ||
17 | Owners: firmware-ipw2x00, firmware-zd1211 | ||
18 | Flags: seen | ||
19 | |||
diff --git a/rootfs/firmware.yaml b/rootfs/firmware.yaml new file mode 100644 index 0000000..b4778d5 --- /dev/null +++ b/rootfs/firmware.yaml | |||
@@ -0,0 +1,18 @@ | |||
1 | parent: local | ||
2 | debconf: firmware.dat | ||
3 | packages: | ||
4 | - firmware-iwlwifi | ||
5 | - firmware-linux | ||
6 | - firmware-linux-nonfree | ||
7 | - firmware-atheros | ||
8 | - firmware-linux-free | ||
9 | - firmware-b43legacy-installer | ||
10 | - firmware-ti-connectivity | ||
11 | - firmware-libertas | ||
12 | - firmware-ipw2x00 | ||
13 | - firmware-ralink | ||
14 | - firmware-b43-installer | ||
15 | - firmware-realtek | ||
16 | - firmware-iwlwifi | ||
17 | - firmware-brcm80211 | ||
18 | - firmware-zd1211 | ||
diff --git a/rootfs/kernel.yaml b/rootfs/kernel.yaml new file mode 100644 index 0000000..d8b10a7 --- /dev/null +++ b/rootfs/kernel.yaml | |||
@@ -0,0 +1,15 @@ | |||
1 | parent: firmware | ||
2 | packages: | ||
3 | - busybox | ||
4 | - cpio | ||
5 | - firmware-linux-free | ||
6 | - initramfs-tools | ||
7 | - initramfs-tools-core | ||
8 | - irqbalance | ||
9 | - klibc-utils | ||
10 | - kmod | ||
11 | - libklibc | ||
12 | - libnuma1 | ||
13 | - linux-base | ||
14 | - linux-image-4.19.0-0.bpo.5-rt-amd64 | ||
15 | - linux-image-amd64 | ||
diff --git a/rootfs/local.dat b/rootfs/local.dat new file mode 100644 index 0000000..b3e390d --- /dev/null +++ b/rootfs/local.dat | |||
@@ -0,0 +1,26 @@ | |||
1 | Name: locales/locales_to_be_generated | ||
2 | Template: locales/locales_to_be_generated | ||
3 | Value: en_US.UTF-8 UTF-8 | ||
4 | Owners: locales | ||
5 | Flags: seen | ||
6 | |||
7 | Name: locales/default_environment_locale | ||
8 | Template: locales/default_environment_locale | ||
9 | Value: en_US.UTF-8 | ||
10 | Owners: locales | ||
11 | Flags: seen | ||
12 | Variables: | ||
13 | locales = en_US.UTF-8 | ||
14 | |||
15 | Name: tzdata/Areas | ||
16 | Template: tzdata/Areas | ||
17 | Value: US | ||
18 | Owners: tzdata | ||
19 | Flags: seen | ||
20 | |||
21 | Name: tzdata/Zones/US | ||
22 | Template: tzdata/Zones/US | ||
23 | Value: Michigan | ||
24 | Owners: tzdata | ||
25 | Flags: seen | ||
26 | |||
diff --git a/rootfs/local.yaml b/rootfs/local.yaml new file mode 100644 index 0000000..97ac73f --- /dev/null +++ b/rootfs/local.yaml | |||
@@ -0,0 +1,2 @@ | |||
1 | parent: 10000000000 | ||
2 | debconf: local.dat | ||
diff --git a/rootfs/network-manager.yaml b/rootfs/network-manager.yaml new file mode 100644 index 0000000..a6c2844 --- /dev/null +++ b/rootfs/network-manager.yaml | |||
@@ -0,0 +1,23 @@ | |||
1 | parent: kernel | ||
2 | packages: | ||
3 | - network-manager | ||
4 | - avahi-daemon | ||
5 | - libnss-mdns | ||
6 | - iproute2 | ||
7 | - iw | ||
8 | - iputils-ping | ||
9 | - firmware-iwlwifi | ||
10 | - firmware-linux | ||
11 | - firmware-linux-nonfree | ||
12 | - firmware-atheros | ||
13 | - firmware-linux-free | ||
14 | - firmware-b43legacy-installer | ||
15 | - firmware-ti-connectivity | ||
16 | - firmware-libertas | ||
17 | - firmware-ipw2x00 | ||
18 | - firmware-ralink | ||
19 | - firmware-b43-installer | ||
20 | - firmware-realtek | ||
21 | - firmware-iwlwifi | ||
22 | - firmware-brcm80211 | ||
23 | - firmware-zd1211 | ||
diff --git a/rootfs/samizdat-deps.yaml b/rootfs/samizdat-deps.yaml new file mode 100644 index 0000000..fb59610 --- /dev/null +++ b/rootfs/samizdat-deps.yaml | |||
@@ -0,0 +1,22 @@ | |||
1 | parent: filesystems | ||
2 | packages: | ||
3 | - ca-certificates | ||
4 | - cryptsetup-bin | ||
5 | - dnsmasq | ||
6 | - eject | ||
7 | - gnupg | ||
8 | - gnupg2 | ||
9 | - gnupg-agent | ||
10 | - grub2-common | ||
11 | - grub-common | ||
12 | - grub-pc | ||
13 | - grub-pc-bin | ||
14 | - hfsprogs | ||
15 | - hfsutils | ||
16 | - nbd-server | ||
17 | - netscript-ipfilter | ||
18 | - openssl | ||
19 | - pinentry-curses | ||
20 | - strongswan | ||
21 | - tor | ||
22 | - xorriso | ||
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml new file mode 100644 index 0000000..b1bc1d9 --- /dev/null +++ b/rootfs/samizdat-wip.yaml | |||
@@ -0,0 +1,91 @@ | |||
1 | parent: samizdat-xorg-extras | ||
2 | packages: | ||
3 | - sudo | ||
4 | - dnsutils | ||
5 | - cron | ||
6 | - sshfs | ||
7 | - emacs25 | ||
8 | - gpm | ||
9 | - parted | ||
10 | |||
11 | # these are dependencies of 'axis': | ||
12 | - 'libsdl-ttf2.0-0' | ||
13 | - 'libsdl-gfx1.2-5' | ||
14 | - 'fonts-liberation' | ||
15 | |||
16 | - 'ffmpeg' # record, selfie, webm, vseg | ||
17 | - 'jq' # musopen | ||
18 | - 'curl' # musopen | ||
19 | - 'miniupnpc' # linlaunch | ||
20 | - 'jackd' # jack-plumbing | ||
21 | - 'pulseaudio' # pavol | ||
22 | - 'pulseaudio-module-jack' | ||
23 | - 'pulseaudio-module-bluetooth' | ||
24 | |||
25 | - 'xserver-xorg-input-wacom' | ||
26 | |||
27 | binaries: | ||
28 | - kiki | ||
29 | - cokiki | ||
30 | - stack | ||
31 | - dhtd | ||
32 | - dht | ||
33 | - 'selfstrap' | ||
34 | - 'stack' | ||
35 | - 'rustup' | ||
36 | |||
37 | skel-files: | ||
38 | - '.bashrc' | ||
39 | - '.config/git/ignore' | ||
40 | - '.gitconfig' # This embeds my email address so not really suitable | ||
41 | # permanently. | ||
42 | - '.spacemacs' | ||
43 | - '.tmux.conf' | ||
44 | - '.tmux.stage2.conf' | ||
45 | - '.vimrc' | ||
46 | - '.xbindkeysrc' | ||
47 | - '.xinitrc' | ||
48 | - '.Xresources' | ||
49 | |||
50 | # keymap control/recue | ||
51 | - '.local/bin/asdf' | ||
52 | - '.local/bin/aoeu' | ||
53 | - '.local/bin/ASDF' | ||
54 | - '.local/bin/dvorak' | ||
55 | - '.local/bin/qwer' | ||
56 | - '.local/bin/асдф' | ||
57 | |||
58 | # misc. programs/scripts I wrote | ||
59 | - '.local/bin/amixer-enable-mic' | ||
60 | - '.local/bin/axis' | ||
61 | - '.local/bin/datel' | ||
62 | - '.local/bin/fsmgr' | ||
63 | - '.local/bin/google' | ||
64 | - '.local/bin/hard-restart-wifi' | ||
65 | - '.local/bin/interactive-rename' | ||
66 | - '.local/bin/jack-plumbing' | ||
67 | - '.local/bin/linlaunch' | ||
68 | - '.local/bin/lptext' | ||
69 | - '.local/bin/midi-dump' | ||
70 | - '.local/bin/musopen' | ||
71 | - '.local/bin/pavol' | ||
72 | - '.local/bin/pdf-autoprint' | ||
73 | - '.local/bin/restart-linux-device' | ||
74 | - '.local/bin/safeunrar' | ||
75 | - '.local/bin/sliceweasel' | ||
76 | - '.local/bin/thinkpad-rotate' | ||
77 | - '.local/bin/x11-ssh-host' | ||
78 | - '.local/bin/xtermessage' | ||
79 | - '.local/bin/xvnc' | ||
80 | |||
81 | # ffmpeg wrappers | ||
82 | - '.local/bin/record' | ||
83 | - '.local/bin/screeny' | ||
84 | - '.local/bin/selfie' | ||
85 | - '.local/bin/soundy' | ||
86 | - '.local/bin/vseg' | ||
87 | - '.local/bin/webbie' | ||
88 | - '.local/bin/webm' | ||
89 | |||
90 | # also this (but is it even used?) | ||
91 | - '.local/bin/xmonad' | ||
diff --git a/rootfs/samizdat-xorg-extras.yaml b/rootfs/samizdat-xorg-extras.yaml new file mode 100644 index 0000000..92da553 --- /dev/null +++ b/rootfs/samizdat-xorg-extras.yaml | |||
@@ -0,0 +1,15 @@ | |||
1 | parent: samizdat-xorg | ||
2 | packages: | ||
3 | - alsa-utils | ||
4 | - build-essential | ||
5 | - less | ||
6 | - linphone | ||
7 | - mpv | ||
8 | - psmisc | ||
9 | - rsync | ||
10 | - strongswan-nm | ||
11 | - strongswan-pki | ||
12 | - strongswan-swanctl | ||
13 | - vim | ||
14 | - w3m | ||
15 | - xbindkeys | ||
diff --git a/rootfs/samizdat-xorg.yaml b/rootfs/samizdat-xorg.yaml new file mode 100644 index 0000000..41a9380 --- /dev/null +++ b/rootfs/samizdat-xorg.yaml | |||
@@ -0,0 +1,10 @@ | |||
1 | parent: samizdat-deps | ||
2 | packages: | ||
3 | - xorg | ||
4 | - libxss1 | ||
5 | - xserver-xorg-input-all | ||
6 | - xserver-xorg-input-wacom | ||
7 | - dmenu | ||
8 | - firefox-esr | ||
9 | binaries: | ||
10 | - xmonad | ||
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml new file mode 100644 index 0000000..4fe094d --- /dev/null +++ b/rootfs/samizdat.yaml | |||
@@ -0,0 +1,11 @@ | |||
1 | parent: samizdat-wip | ||
2 | packages: [] | ||
3 | binaries: | ||
4 | - samizdat-diff-root | ||
5 | - samizdat-daily-snapshot-root | ||
6 | skel-files: [] | ||
7 | |||
8 | chroot-commands: | ||
9 | - "useradd u -G sudo -m -p '' -s /bin/bash" | ||
10 | - "touch /var/lib/sudo/lectured/u" | ||
11 | - "apt-get -f install" | ||
diff --git a/rootfs/useful.yaml b/rootfs/useful.yaml new file mode 100644 index 0000000..fa3d014 --- /dev/null +++ b/rootfs/useful.yaml | |||
@@ -0,0 +1,9 @@ | |||
1 | parent: network-manager | ||
2 | packages: | ||
3 | - systemd-sysv | ||
4 | - vim-tiny | ||
5 | - git | ||
6 | - tmux | ||
7 | - ssh | ||
8 | chroot-commands: | ||
9 | - "rm -f /etc/ssh/ssh_host_*_key*" | ||