From d9822cd859f91394455c58bae81caed7bbb15bd0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 13 Nov 2024 17:03:35 +0000 Subject: [PATCH 1/2] fetch-distro: use git log --first-parent We now import the upstream tag in the debian repository, so this explodes as it tries to walk all upstream commits. Use --first-parent so that merges only get added via the merge commit. --- tools/fetch-distro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py index 9fc5b1bfa6..1da1b8486e 100755 --- a/tools/fetch-distro.py +++ b/tools/fetch-distro.py @@ -96,7 +96,7 @@ def update_distro(args, distro: str, config: dict): print(f'{distro}: commit {new_commit!s} is still fresh') return - cmd = ['git', '-C', f'pkg/{distro}', 'log', '--graph', + cmd = ['git', '-C', f'pkg/{distro}', 'log', '--graph', '--first-parent', '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10', f'{old_commit}..{new_commit}'] print(f"+ {shlex.join(cmd)}") From 1bc3095de8510c2464638a7073b0b48ed07feef4 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 13 Nov 2024 17:03:45 +0000 Subject: [PATCH 2/2] mkosi: update debian commit reference * 48fabbd5d2 Install new sd-keyutil binary in sd-repart package * 6dd9ab10fe Update changelog for 257~rc1-4 release * 6dd325f04b Backport patch to fix TEST-07-PID1 integration test * 5988cc60ee Update changelog for 257~rc1-3 release * cf3a2f7ccc Backport another patch to fix test failure on buildd * 5d6a226dbb Update changelog for 257~rc1-2 release * ebe97c52c8 Backport patch to fix unit test failure on buildd * 21f63b20bb Update changelog for 257~rc1-1 release * 0dfec51bbb d/copyright: remove pattern for directory that is no longer present * 337b3bb2dd Ignore Lintian warning dh-exec-script-without-dh-exec-features * b680e6b448 List new libsystemd0 symbols * 3c00aa000c gbp.conf: use --first-parent for dch to avoid upstream commits * d53ecc7769 Install new files * 546e8c9137 Drop all patches, merged upstream * 6757597480 Update upstream source from tag 'upstream/257_rc1' * 4b82805020 gbp.conf: switch upstream branch to full upstream history * e60c637a95 gbp.conf: enable signing tags by default * 2ad27b63c4 Update changelog for 256.7-3 release * a212c36c54 systemd-boot: provide integration with shim --- mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf index e0ac99524c..8b66f6cf06 100644 --- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf @@ -9,7 +9,7 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=2f288667e0f5eeba19b14d24b621baef2aa413e1 + GIT_COMMIT=48fabbd5d240a70fce6712b6161f29b40b2fc7de PKG_SUBDIR=debian [Content]