From 45a38fbfc6b1f3cd1ff3704e38d7579d1b309764 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sun, 13 Oct 2019 17:02:38 -0400 Subject: rootfs: try to add all needed build deps --- rootfs/build-deps.yaml | 49 ++++++++++++++++++++++++++++++++++++++++ rootfs/dpkg.yaml | 4 ++++ rootfs/filesystems.yaml | 1 + rootfs/firmware.yaml | 1 + rootfs/kernel.yaml | 1 + rootfs/local.yaml | 1 + rootfs/network-manager.yaml | 1 + rootfs/samizdat-deps.yaml | 1 + rootfs/samizdat-wip.yaml | 4 ++-- rootfs/samizdat-xorg-extras.yaml | 1 + rootfs/samizdat-xorg.yaml | 1 + rootfs/samizdat.yaml | 10 ++++---- rootfs/useful.yaml | 1 + 13 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 rootfs/build-deps.yaml create mode 100644 rootfs/dpkg.yaml 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 -unpack-only: true +parent: build-deps +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 -- kbd +#- libncurses5-dev +#- 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 -- cgit v1.2.3