Merge pull request #33126 from keszybz/revert-ci-workaround

Revert ci workaround

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)

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}" \