From: Luca Boccassi Date: Wed, 3 Jul 2024 18:15:03 +0000 (+0100) Subject: mkosi: remove conflicting deb packages from builddir X-Git-Tag: v257-rc1~980 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce513c6c6cfbb52dd4736f8074b61d2dfdb2417d;p=thirdparty%2Fsystemd.git 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 --- 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 6b6f7a287b2..047037ad60e 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 )