summaryrefslogtreecommitdiffstats
path: root/mkosi.images
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2024-07-03 20:15:03 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-07-03 21:05:14 +0200
commitce513c6c6cfbb52dd4736f8074b61d2dfdb2417d (patch)
tree0b239811ddd2ab72114b0af4e39d593307add6ab /mkosi.images
parentload-fragment: Remove faulty assertion (diff)
downloadsystemd-ce513c6c6cfbb52dd4736f8074b61d2dfdb2417d.tar.xz
systemd-ce513c6c6cfbb52dd4736f8074b61d2dfdb2417d.zip
mkosi: remove conflicting deb packages from builddir
These are not actually needed or installed, so delete them from the build directory, so that inside an image one can do: apt install --reinstall /work/build/*.deb Follow-up for 690a85b1d4e794af62bca6d1ea530ffc530ee58c
Diffstat (limited to 'mkosi.images')
-rwxr-xr-xmkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
index 6b6f7a287b..047037ad60 100755
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
@@ -140,4 +140,6 @@ fi
cp ../*.deb ../*.ddeb "$PACKAGEDIR"
cp ../*.deb ../*.ddeb "$OUTPUTDIR"
cp ../*.deb ../*.ddeb "$BUILDDIR"
+ # These conflict with the packages that we actually want to install, so remove them
+ rm -f "$BUILDDIR"/systemd-standalone-*.deb "$BUILDDIR"/systemd-standalone-*.ddeb
)