summaryrefslogtreecommitdiffstats
path: root/mkosi.images/system/mkosi.conf.d/10-arch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-16 18:18:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-16 18:18:14 +0000
commit67c5de60daa85b91fa68be4157e248fa31e75316 (patch)
tree7d567f3360f705ac21600343ef7f7cea645a9222 /mkosi.images/system/mkosi.conf.d/10-arch
parentAdding upstream version 256.1. (diff)
downloadsystemd-06a0a2fdeaf41892705cfec541146336e3c21087.tar.xz
systemd-06a0a2fdeaf41892705cfec541146336e3c21087.zip
Adding upstream version 256.2.upstream/256.2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mkosi.images/system/mkosi.conf.d/10-arch')
-rwxr-xr-xmkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot8
-rw-r--r--mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf5
2 files changed, 9 insertions, 4 deletions
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"
diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
index 036b0a3..96ae8c8 100644
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
@@ -7,7 +7,7 @@ Distribution=arch
Environment=
GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
GIT_BRANCH=main
- GIT_COMMIT=dc6c099e0785753c1c88b4adcbcbfc209a8d12e3
+ GIT_COMMIT=d74b24c7c6077740c35a876445febe6d26bf013c
VolatilePackages=
systemd
@@ -20,7 +20,6 @@ VolatilePackages=
Packages=
bind
bpf
- btrfs-progs
compiler-rt
compsize
cryptsetup
@@ -43,6 +42,7 @@ Packages=
openssh
openssl
pacman
+ perf
pkgconf
polkit
procps-ng
@@ -61,7 +61,6 @@ Packages=
vim
InitrdPackages=
- btrfs-progs
compiler-rt
tpm2-tools