diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:28:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:28:34 +0000 |
| commit | 39bea55b2de0eabc2a876ed40dd664d1f80cbcd2 (patch) | |
| tree | 440d70559330bcdfe14968d44dd5d33ea570281e /mkosi.images/build/mkosi.conf.d/arch | |
| parent | Releasing progress-linux version 256.5-2~progress7.99u1. (diff) | |
| download | systemd-39bea55b2de0eabc2a876ed40dd664d1f80cbcd2.tar.xz systemd-39bea55b2de0eabc2a876ed40dd664d1f80cbcd2.zip | |
Merging upstream version 256.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mkosi.images/build/mkosi.conf.d/arch')
| -rwxr-xr-x | mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot | 11 | ||||
| -rw-r--r-- | mkosi.images/build/mkosi.conf.d/arch/mkosi.conf | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot index 3ffde85..8d501ec 100755 --- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot +++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot @@ -61,22 +61,23 @@ EOF # Linting the PKGBUILD takes multiple seconds every build so avoid that by nuking all the linting functions. rm /usr/share/makepkg/lint_pkgbuild/* -if [[ -d .git/ ]] && [[ -z "$(git status --porcelain)" ]]; then - TS="$(git show --no-patch --format=%ct HEAD)" -else - TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" -fi +TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" sed --in-place "pkg/$PKG_SUBDIR/PKGBUILD" \ --expression "s/^_tag=.*/_tag=$(cat meson.version)/" \ --expression "s/^pkgrel=.*/pkgrel=$(date "+%Y%m%d%H%M%S" --date "@$TS")/" +# Replace cdrom/dialout/tape groups with optical/uucp/storage. We apply this patch manually because we run +# with --noprepare. +patch -Np1 -i pkg/arch/0001-Use-Arch-Linux-device-access-groups.patch + # We get around makepkg's root check by setting EUID to something else. # shellcheck disable=SC2046 env --chdir="pkg/$PKG_SUBDIR" \ EUID=123 \ makepkg \ --noextract \ + --noprepare \ $( ((WITH_TESTS)) || echo --nocheck) \ --force \ _systemd_UPSTREAM=1 \ diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf index c071468..91a4d17 100644 --- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/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=1d577a62688419ee4af01b847e55845cd9780301 + GIT_COMMIT=ea5f086275aeba40d878507fba8b22308c3fac01 PKG_SUBDIR=arch Packages= |