From 2b689e3af421bdd35ccd34cdc733d4d8a40843b3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 16 Sep 2024 20:19:03 +0200 Subject: Merging upstream version 256.2. Signed-off-by: Daniel Baumann --- mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot') diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot index 1f6e0c3..2c99a67 100755 --- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot @@ -16,7 +16,7 @@ fi # We can't configure the source or build directory so we use symlinks instead to make sure they are in the # expected locations. -ln --symbolic "$SRCDIR" "pkg/$ID/systemd-stable" +ln --symbolic "$SRCDIR" "pkg/$ID/systemd" ln --symbolic "$BUILDDIR" "pkg/$ID/build" # Because we run with --noextract we are responsible for making sure the source files appear in src/. ln --symbolic . "pkg/$ID/src" @@ -90,4 +90,10 @@ env --chdir="pkg/$ID" \ PKGEXT=".pkg.tar" \ MESON_EXTRA_CONFIGURE_OPTIONS="$MKOSI_MESON_OPTIONS $MESON_OPTIONS" +( + shopt -s nullglob + rm -f "$BUILDDIR"/*.pkg.tar +) + cp "$OUTPUTDIR"/*.pkg.tar "$PACKAGEDIR" +cp "$OUTPUTDIR"/*.pkg.tar "$BUILDDIR" -- cgit v1.2.3