From: Daan De Meyer Date: Thu, 3 Apr 2025 20:44:32 +0000 (+0200) Subject: mkosi: Fix arch build script version sed expression X-Git-Tag: v258-rc1~917 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0ca911d633690a0c2097a4319daf1d3a803fb70;p=thirdparty%2Fsystemd.git mkosi: Fix arch build script version sed expression Yours truly got rid of the _tag variable in the Arch Linux PKGBUILD a while ago, so actually adapt the build script to that by changing the pkgver= variable instead. --- diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot index d60a7e97932..3e96080dd84 100755 --- a/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot +++ b/mkosi/mkosi.images/build/mkosi.conf.d/arch/mkosi.build.chroot @@ -59,7 +59,7 @@ EOF TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" sed "pkg/$PKG_SUBDIR/PKGBUILD" \ - --expression "s/^_tag=.*/_tag=$(cat meson.version)/" \ + --expression "s/^pkgver=.*/pkgver=$(cat meson.version)/" \ --expression "s/^pkgrel=.*/pkgrel=$(date "+%Y%m%d%H%M%S" --date "@$TS")/" >/tmp/PKGBUILD mount --bind /tmp/PKGBUILD "pkg/$PKG_SUBDIR/PKGBUILD"