Merge pull request #18416 from yuwata/strverscmp

util: introduce strverscmp_improved()

src/shared/bootspec.c

@@ -244,7 +244,7 @@ static int boot_loader_read_conf(const char *path, BootConfig *config) {
 }
 
 static int boot_entry_compare(const BootEntry *a, const BootEntry *b) {
-        return str_verscmp(a->id, b->id);
+        return strverscmp_improved(a->id, b->id);
 }
 
 static int boot_entries_find(

src/shared/condition.c

@@ -247,7 +247,7 @@ static int condition_test_kernel_version(Condition *c, char **env) {
                                         return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Unexpected end of expression: %s", p);
                         }
 
-                        r = test_order(str_verscmp(u.release, s), order);
+                        r = test_order(strverscmp_improved(u.release, s), order);
                 } else
                         /* No prefix? Then treat as glob string */
                         r = fnmatch(s, u.release, 0) == 0;

src/shared/efi-loader-features.h

@@ -1 +0,0 @@
-../boot/efi/loader-features.h

src/shared/meson.build

@@ -89,7 +89,6 @@ shared_sources = files('''
         dns-domain.h
         dropin.c
         dropin.h
-        efi-loader-features.h
         efi-loader.c
         efi-loader.h
         enable-mempool.c