From d0327823d8724c97df53851bd95467f8b334aeb4 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 22 Mar 2024 16:49:46 +0100 Subject: [PATCH] mkosi: Switch to Arch Linux packaging sources main branch https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/merge_requests/8 was merged so let's switch branches to the main branch. --- .gitmodules | 4 ++-- mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot | 6 ++++-- pkg/arch | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index ba9f6d7f27e..787e4c85f5b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,5 +16,5 @@ branch = c9s-sig-hyperscale [submodule "pkg/arch"] path = pkg/arch - url = https://gitlab.archlinux.org/daandemeyer/systemd.git - branch = strip + url = https://gitlab.archlinux.org/archlinux/packaging/packages/systemd + branch = main diff --git a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot index 5304afff28d..83887b1fba1 100755 --- a/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot +++ b/mkosi.images/base/mkosi.conf.d/10-arch/mkosi.build.chroot @@ -35,6 +35,10 @@ else TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" fi +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")/" + # We get around makepkg's root check by setting EUID to something else. # shellcheck disable=SC2046 env --chdir="pkg/$PKG_SUBDIR" \ @@ -48,6 +52,4 @@ env --chdir="pkg/$PKG_SUBDIR" \ BUILDDIR="$PWD/pkg/$PKG_SUBDIR" \ PKGDEST="$PACKAGEDIR" \ PKGEXT=".pkg.tar" \ - PKGVER="$(cat meson.version)" \ - PKGREL="$(date "+%Y%m%d%H%M%S" --date "@$TS")" \ MESON_EXTRA_CONFIGURE_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}" diff --git a/pkg/arch b/pkg/arch index b33762d07ce..4d1ecb08358 160000 --- a/pkg/arch +++ b/pkg/arch @@ -1 +1 @@ -Subproject commit b33762d07ce712f5c675bdc8f882a096aa59bf09 +Subproject commit 4d1ecb083589270e9137c8bd3838e6b73bfdbff7 -- 2.47.3