From 89a5ea6583840261896b2d5e8ac60dedde7da422 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 25 Feb 2025 19:30:42 +0100 Subject: [PATCH 1/2] mkosi: update fedora commit reference * 9b6884d2e1 Stop using version_no_tilde for github archives * 5671cf6132 List the fallback Source0 first --- mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf index 920a67641e..02655bb7f6 100644 --- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf @@ -8,7 +8,7 @@ Distribution=|fedora Environment= GIT_URL=https://src.fedoraproject.org/rpms/systemd.git GIT_BRANCH=rawhide - GIT_COMMIT=6c7c4a510d8337f6d5e3e5ad08ee56ecb69335bd + GIT_COMMIT=9b6884d2e1c1664cf07ef90e28ab072eda61431f PKG_SUBDIR=fedora [Content] From 6a558625162591b34f6daf7e8878d79f78e3e8be Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 25 Feb 2025 12:01:53 +0100 Subject: [PATCH 2/2] packit: Switch to meson.version for the current version --- .packit.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.packit.yml b/.packit.yml index 697defd3e7..37bf55a0cb 100644 --- a/.packit.yml +++ b/.packit.yml @@ -14,11 +14,7 @@ srpm_build_deps: [] actions: get-current-version: - # Show the closest matching tag for the checked out revision, otherwise - # Packit tries to get the latest tag by creation date, which doesn't work - # well in the systemd-stable repo. We also need to sanitize it manually - # since "upstream_tag_template" defined above doesn't apply here. - - "bash -ec 'git describe --tags --abbrev=0 | cut -b 2-'" + - cat meson.version post-upstream-clone: # Use the Fedora Rawhide specfile