From a67a73005236075b283733f3460cd0af2eddf7bd Mon Sep 17 00:00:00 2001 From: Richard Phibel Date: Apr 27 2023 19:19:00 +0000 Subject: Move standalone check before udev to prevent repart standalone to finish in udev file list --- diff --git a/split-files.py b/split-files.py index 2f57e5a..f0679b0 100644 --- a/split-files.py +++ b/split-files.py @@ -104,6 +104,18 @@ for file in files(buildroot): elif '.so.' in n: o = o_libs + elif n.endswith('.standalone'): + if 'tmpfiles' in n: + o = o_standalone_tmpfiles + elif 'sysusers' in n: + o = o_standalone_sysusers + elif 'repart' in n: + o = o_standalone_repart + elif 'shutdown' in n: + o = o_standalone_shutdown + else: + assert False, 'Found .standalone not belonging to known packages' + elif re.search(r'''udev(?!\.pc)| hwdb| bootctl| @@ -166,18 +178,6 @@ for file in files(buildroot): elif re.search(r'10-oomd-.*defaults.conf|lib/systemd/oomd.conf.d', n, re.X): o = o_oomd_defaults - elif n.endswith('.standalone'): - if 'tmpfiles' in n: - o = o_standalone_tmpfiles - elif 'sysusers' in n: - o = o_standalone_sysusers - elif 'repart' in n: - o = o_standalone_repart - elif 'shutdown' in n: - o = o_standalone_shutdown - else: - assert False, 'Found .standalone not belonging to known packages' - else: o = o_main