deps.txt: move some deps to vmdeps.txt

jlebon · jlebon · commit 2d6b65ae6d28 · 2024-11-27T10:29:09.000-05:00
We run osbuild inside of supermin, so for building the live ISO we'll
need all the tools it needs in there. This includes `genisoimage` and
`syslinux-nonlinux`, and on s390x, lorax (for its templates).

We don't currently name `squashfs-tools` as a toplevel dependency. It's
currently pulled in by libguestfs, but we need it in supermin too, so
explicitly list it there.
diff --git a/src/deps-s390x.txt b/src/deps-s390x.txt
@@ -1,5 +1,5 @@
 # For building iso image
-lorax xorriso
+xorriso
 
 # Deps needed by supermin
 s390utils-base
diff --git a/src/deps-x86_64.txt b/src/deps-x86_64.txt
@@ -1,6 +1,3 @@
-# For generating ISO images
-syslinux-nonlinux
-
 # For the pipeline and developers to interact with AWS. It's not needed by cosa
 # itself. This isn't available on s390x at least, so make it x86_64-only.
 awscli2
diff --git a/src/deps.txt b/src/deps.txt
@@ -16,9 +16,6 @@ dumb-init
 rpm-ostree createrepo_c openssh-clients python3-createrepo_c composefs
 dnf-utils
 
-# For generating ISO images
-genisoimage
-
 # Standard build tools
 make git rpm-build
 
@@ -100,4 +97,4 @@ bsdtar
 fedora-repos-ostree
 
 # For graphing manifest includes using `manifest_graph`
-python-anytree
+python-anytree
diff --git a/src/vmdeps-s390x.txt b/src/vmdeps-s390x.txt
@@ -1,4 +1,7 @@
 s390utils-base
 
+# for building iso image
+lorax
+
 # for Secure Execution
 veritysetup
diff --git a/src/vmdeps-x86_64.txt b/src/vmdeps-x86_64.txt
@@ -2,6 +2,9 @@
 grub2
 bootupd
 
+# For generating ISO images
+syslinux-nonlinux
+
 # For creating bootable UEFI media on x86_64
 shim-x64 grub2-efi-x64
 
diff --git a/src/vmdeps.txt b/src/vmdeps.txt
@@ -5,6 +5,9 @@
 # bare essentials
 bash vim-minimal coreutils util-linux procps-ng kmod kernel-modules
 
+# For generating ISO images
+genisoimage squashfs-tools
+
 # for composes
 rpm-ostree distribution-gpg-keys jq
 
