]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: remove conflicting deb packages from builddir
authorLuca Boccassi <bluca@debian.org>
Wed, 3 Jul 2024 18:15:03 +0000 (19:15 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 3 Jul 2024 19:05:14 +0000 (21:05 +0200)
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

mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot

index 6b6f7a287b2efcc4483fc0ab66c0476ed28ae788..047037ad60e44752ac1efe2ae1cdf5ebab96c37e 100755 (executable)
@@ -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
 )