13 files changed, 69 insertions, 7 deletions
diff --git a/rootfs/build-deps.yaml b/rootfs/build-deps.yaml
new file mode 100644
index 0000000..cf36bab
--- /dev/null
+++ b/rootfs/build-deps.yaml
@@ -0,0 +1,49 @@
+parent: samizdat-wip
+unpack-only: false
+packages:
+- libncurses5-dev
+- kbd
+- apt-utils
+- autotools-dev
+- bridge-utils
+- cryptsetup
+#- cryptsetup-initramfs
+- curl
+- dbus-x11
+- debhelper
+- dh-autoreconf
+- dh-exec
+- dh-systemd
+- dnsutils
+- expect
+- fakeroot
+- ffmpeg
+- fonts-liberation
+- gconf-service
+- hfsplus
+- ifupdown
+- imagemagick-6-common
+- jackd
+- jq
+- libgtk-3-common
+- libjson-glib-1.0-common
+- libkrb5-dev
+- liblockfile-bin
+- libmime-base32-perl
+- m17n-db
+- miniupnpc
+#- monkeysphere
+#- openssh-server
+#- openssh-sftp-server
+- parted
+- pgpdump
+- pulseaudio-module-bluetooth
+- pulseaudio-module-jack
+- pulseaudio-utils
+- qemu-system-x86
+#- ssh
+#- ssh-askpass-gnome
+- sshfs
+- strace
+- uml-utilities
diff --git a/rootfs/dpkg.yaml b/rootfs/dpkg.yaml
new file mode 100644
index 0000000..7478fe2
--- /dev/null
+++ b/rootfs/dpkg.yaml
@@ -0,0 +1,4 @@
+parent: samizdat-wip
+chroot-commands:
+#- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
+- "true"
diff --git a/rootfs/filesystems.yaml b/rootfs/filesystems.yaml
index 1a6b9cb..22cafe8 100644
--- a/rootfs/filesystems.yaml
+++ b/rootfs/filesystems.yaml
@@ -1,4 +1,5 @@
 parent: useful
+unpack-only: false
 packages:
 - btrfs-progs
 - cryptsetup-bin
diff --git a/rootfs/firmware.yaml b/rootfs/firmware.yaml
index b4778d5..652bcc7 100644
--- a/rootfs/firmware.yaml
+++ b/rootfs/firmware.yaml
@@ -1,4 +1,5 @@
 parent: local
+unpack-only: false
 debconf: firmware.dat
 packages:
 - firmware-iwlwifi
diff --git a/rootfs/kernel.yaml b/rootfs/kernel.yaml
index a8ae5eb..1ab32cc 100644
--- a/rootfs/kernel.yaml
+++ b/rootfs/kernel.yaml
@@ -1,4 +1,5 @@
 parent: samizdat-xorg-extras
+unpack-only: false
 packages:
 - busybox
 - cpio
diff --git a/rootfs/local.yaml b/rootfs/local.yaml
index 97ac73f..0796770 100644
--- a/rootfs/local.yaml
+++ b/rootfs/local.yaml
@@ -1,2 +1,3 @@
 parent: 10000000000
+unpack-only: false
 debconf: local.dat
diff --git a/rootfs/network-manager.yaml b/rootfs/network-manager.yaml
index a5d26e3..4b8edc0 100644
--- a/rootfs/network-manager.yaml
+++ b/rootfs/network-manager.yaml
@@ -1,4 +1,5 @@
 parent: firmware
+unpack-only: false
 packages:
 - network-manager
 - avahi-daemon
diff --git a/rootfs/samizdat-deps.yaml b/rootfs/samizdat-deps.yaml
index fb59610..3eab458 100644
--- a/rootfs/samizdat-deps.yaml
+++ b/rootfs/samizdat-deps.yaml
@@ -1,4 +1,5 @@
 parent: filesystems
+unpack-only: false
 packages:
 - ca-certificates
 - cryptsetup-bin
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml
index 064569d..008ee95 100644
--- a/rootfs/samizdat-wip.yaml
+++ b/rootfs/samizdat-wip.yaml
@@ -1,5 +1,5 @@
 parent: kernel
-unpack-only: true
+unpack-only: false
 packages:
 - ../openssh-client_7.9p1-10_$(karch).deb
 - ../openssh-server_7.9p1-10_$(karch).deb
@@ -95,4 +95,4 @@ skel-files:
 - '.local/bin/webm'
 # also this (but is it even used?)
- '.local/bin/xmonad'
+#- '.local/bin/xmonad'
diff --git a/rootfs/samizdat-xorg-extras.yaml b/rootfs/samizdat-xorg-extras.yaml
index 92da553..fe40e4f 100644
--- a/rootfs/samizdat-xorg-extras.yaml
+++ b/rootfs/samizdat-xorg-extras.yaml
@@ -1,4 +1,5 @@
 parent: samizdat-xorg
+unpack-only: false
 packages:
 - alsa-utils
 - build-essential
diff --git a/rootfs/samizdat-xorg.yaml b/rootfs/samizdat-xorg.yaml
index d88ca98..513c215 100644
--- a/rootfs/samizdat-xorg.yaml
+++ b/rootfs/samizdat-xorg.yaml
@@ -1,4 +1,5 @@
 parent: samizdat-deps
+unpack-only: false
 packages:
 - xorg
 - libxss1
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index 9f46792..5806308 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -1,5 +1,5 @@
-parent: samizdat-wip
+parent: build-deps
-unpack-only: true
+unpack-only: false
 binaries:
 - samizdat-diff-root
 - samizdat-daily-snapshot-root
@@ -11,8 +11,8 @@ packages:
 - dbus-x11
 # these are really build-deps
- libncurses5-dev
+#- libncurses5-dev
- kbd
+#- kbd
 skel-files: []
@@ -21,4 +21,4 @@ chroot-commands:
 - "touch /var/lib/sudo/lectured/u"
 - "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"
 - "systemctl enable debug-shell"
-# - "DEBIAN_FRONTEND=noninteractive apt-get -f install"
+#- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
diff --git a/rootfs/useful.yaml b/rootfs/useful.yaml
index edec839..c957619 100644
--- a/rootfs/useful.yaml
+++ b/rootfs/useful.yaml
@@ -1,4 +1,5 @@
 parent: network-manager
+unpack-only: false
 packages:
 - systemd-sysv
 - vim-tiny

diff --git a/rootfs/build-deps.yaml b/rootfs/build-deps.yaml new file mode 100644 index 0000000..cf36bab --- /dev/null +++ b/rootfs/build-deps.yaml
@@ -0,0 +1,49 @@
		1	parent: samizdat-wip
		2	unpack-only: false
		3	packages:
		4	- libncurses5-dev
		5	- kbd
		6
		7	- apt-utils
		8	- autotools-dev
		9	- bridge-utils
		10	- cryptsetup
		11	#- cryptsetup-initramfs
		12	- curl
		13	- dbus-x11
		14	- debhelper
		15	- dh-autoreconf
		16	- dh-exec
		17	- dh-systemd
		18	- dnsutils
		19	- expect
		20	- fakeroot
		21	- ffmpeg
		22	- fonts-liberation
		23	- gconf-service
		24	- hfsplus
		25	- ifupdown
		26	- imagemagick-6-common
		27	- jackd
		28	- jq
		29	- libgtk-3-common
		30	- libjson-glib-1.0-common
		31	- libkrb5-dev
		32	- liblockfile-bin
		33	- libmime-base32-perl
		34	- m17n-db
		35	- miniupnpc
		36	#- monkeysphere
		37	#- openssh-server
		38	#- openssh-sftp-server
		39	- parted
		40	- pgpdump
		41	- pulseaudio-module-bluetooth
		42	- pulseaudio-module-jack
		43	- pulseaudio-utils
		44	- qemu-system-x86
		45	#- ssh
		46	#- ssh-askpass-gnome
		47	- sshfs
		48	- strace
		49	- uml-utilities


diff --git a/rootfs/dpkg.yaml b/rootfs/dpkg.yaml new file mode 100644 index 0000000..7478fe2 --- /dev/null +++ b/rootfs/dpkg.yaml
@@ -0,0 +1,4 @@
		1	parent: samizdat-wip
		2	chroot-commands:
		3	#- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
		4	- "true"


diff --git a/rootfs/filesystems.yaml b/rootfs/filesystems.yaml index 1a6b9cb..22cafe8 100644 --- a/rootfs/filesystems.yaml +++ b/rootfs/filesystems.yaml
@@ -1,4 +1,5 @@
1	parent: useful	1	parent: useful
		2	unpack-only: false
2	packages:	3	packages:
3	- btrfs-progs	4	- btrfs-progs
4	- cryptsetup-bin	5	- cryptsetup-bin


diff --git a/rootfs/firmware.yaml b/rootfs/firmware.yaml index b4778d5..652bcc7 100644 --- a/rootfs/firmware.yaml +++ b/rootfs/firmware.yaml
@@ -1,4 +1,5 @@
1	parent: local	1	parent: local
		2	unpack-only: false
2	debconf: firmware.dat	3	debconf: firmware.dat
3	packages:	4	packages:
4	- firmware-iwlwifi	5	- firmware-iwlwifi


diff --git a/rootfs/kernel.yaml b/rootfs/kernel.yaml index a8ae5eb..1ab32cc 100644 --- a/rootfs/kernel.yaml +++ b/rootfs/kernel.yaml
@@ -1,4 +1,5 @@
1	parent: samizdat-xorg-extras	1	parent: samizdat-xorg-extras
		2	unpack-only: false
2	packages:	3	packages:
3	- busybox	4	- busybox
4	- cpio	5	- cpio


diff --git a/rootfs/local.yaml b/rootfs/local.yaml index 97ac73f..0796770 100644 --- a/rootfs/local.yaml +++ b/rootfs/local.yaml
@@ -1,2 +1,3 @@
1	parent: 10000000000	1	parent: 10000000000
		2	unpack-only: false
2	debconf: local.dat	3	debconf: local.dat


diff --git a/rootfs/network-manager.yaml b/rootfs/network-manager.yaml index a5d26e3..4b8edc0 100644 --- a/rootfs/network-manager.yaml +++ b/rootfs/network-manager.yaml
@@ -1,4 +1,5 @@
1	parent: firmware	1	parent: firmware
		2	unpack-only: false
2	packages:	3	packages:
3	- network-manager	4	- network-manager
4	- avahi-daemon	5	- avahi-daemon


diff --git a/rootfs/samizdat-deps.yaml b/rootfs/samizdat-deps.yaml index fb59610..3eab458 100644 --- a/rootfs/samizdat-deps.yaml +++ b/rootfs/samizdat-deps.yaml
@@ -1,4 +1,5 @@
1	parent: filesystems	1	parent: filesystems
		2	unpack-only: false
2	packages:	3	packages:
3	- ca-certificates	4	- ca-certificates
4	- cryptsetup-bin	5	- cryptsetup-bin


diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml index 064569d..008ee95 100644 --- a/rootfs/samizdat-wip.yaml +++ b/rootfs/samizdat-wip.yaml
@@ -1,5 +1,5 @@
1	parent: kernel	1	parent: kernel
2	unpack-only: true	2	unpack-only: false
3	packages:	3	packages:
4	- ../openssh-client_7.9p1-10_$(karch).deb	4	- ../openssh-client_7.9p1-10_$(karch).deb
5	- ../openssh-server_7.9p1-10_$(karch).deb	5	- ../openssh-server_7.9p1-10_$(karch).deb
@@ -95,4 +95,4 @@ skel-files:
95	- '.local/bin/webm'	95	- '.local/bin/webm'
96		96
97	# also this (but is it even used?)	97	# also this (but is it even used?)
98	- '.local/bin/xmonad'	98	#- '.local/bin/xmonad'


diff --git a/rootfs/samizdat-xorg-extras.yaml b/rootfs/samizdat-xorg-extras.yaml index 92da553..fe40e4f 100644 --- a/rootfs/samizdat-xorg-extras.yaml +++ b/rootfs/samizdat-xorg-extras.yaml
@@ -1,4 +1,5 @@
1	parent: samizdat-xorg	1	parent: samizdat-xorg
		2	unpack-only: false
2	packages:	3	packages:
3	- alsa-utils	4	- alsa-utils
4	- build-essential	5	- build-essential


diff --git a/rootfs/samizdat-xorg.yaml b/rootfs/samizdat-xorg.yaml index d88ca98..513c215 100644 --- a/rootfs/samizdat-xorg.yaml +++ b/rootfs/samizdat-xorg.yaml
@@ -1,4 +1,5 @@
1	parent: samizdat-deps	1	parent: samizdat-deps
		2	unpack-only: false
2	packages:	3	packages:
3	- xorg	4	- xorg
4	- libxss1	5	- libxss1


diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml index 9f46792..5806308 100644 --- a/rootfs/samizdat.yaml +++ b/rootfs/samizdat.yaml
@@ -1,5 +1,5 @@
1	parent: samizdat-wip	1	parent: build-deps
2	unpack-only: true	2	unpack-only: false
3	binaries:	3	binaries:
4	- samizdat-diff-root	4	- samizdat-diff-root
5	- samizdat-daily-snapshot-root	5	- samizdat-daily-snapshot-root
@@ -11,8 +11,8 @@ packages:
11	- dbus-x11	11	- dbus-x11
12		12
13	# these are really build-deps	13	# these are really build-deps
14	- libncurses5-dev	14	#- libncurses5-dev
15	- kbd	15	#- kbd
16		16
17	skel-files: []	17	skel-files: []
18		18
@@ -21,4 +21,4 @@ chroot-commands:
21	- "touch /var/lib/sudo/lectured/u"	21	- "touch /var/lib/sudo/lectured/u"
22	- "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"	22	- "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"
23	- "systemctl enable debug-shell"	23	- "systemctl enable debug-shell"
24	# - "DEBIAN_FRONTEND=noninteractive apt-get -f install"	24	#- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"


diff --git a/rootfs/useful.yaml b/rootfs/useful.yaml index edec839..c957619 100644 --- a/rootfs/useful.yaml +++ b/rootfs/useful.yaml
@@ -1,4 +1,5 @@
1	parent: network-manager	1	parent: network-manager
		2	unpack-only: false
2	packages:	3	packages:
3	- systemd-sysv	4	- systemd-sysv
4	- vim-tiny	5	- vim-tiny