From 00d359e988969b78f837a78e59389f543e2086cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 31 May 2024 13:33:57 +0200 Subject: [PATCH 1/2] Revert "mkosi: Disable add-determinism on Fedora" This reverts commit e74a994ebf7c813979b9e045f37907e6a5064f23. The description in that commit was confused, add-determinism was not broken and was not causing any problems, except a log message. --- .../system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot | 1 - 1 file changed, 1 deletion(-) diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot index 7618f07839..f3981c99a4 100755 --- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot @@ -72,7 +72,6 @@ ANNOBIN="no-active-checks" rpmbuild \ --define "__brp_strip_comment_note %{nil}" \ --define "__brp_strip_static_archive %{nil}" \ --define "__brp_check_rpaths %{nil}" \ - --undefine __brp_add_determinism \ --define "__elf_exclude_path ^/usr/lib/systemd/tests/unit-tests/.*$" \ --define "__script_requires %{nil}" \ --define "_find_debuginfo_dwz_opts %{nil}" \ From 822ee89b953287ecabc68591e7fdad97aa175b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 13 May 2024 15:34:23 +0200 Subject: [PATCH 2/2] meson: fix comment --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f17c8798cc..2c37139dc8 100644 --- a/meson.build +++ b/meson.build @@ -942,7 +942,7 @@ foreach option : ['adm-gid', name = option.underscorify().to_upper() val = get_option(option) - # Ensure provided GID argument is numeric, otherwise fall back to default assignment + # Ensure provided GID argument is positive, otherwise fall back to default assignment conf.set(name, val > 0 ? val : '-') if val > 0 static_ugids += '@0@:@1@'.format(option, val)