Merge pull request #23531 from yuwata/sd-bus-drop-version-2

sd-bus: drop version 2 format support

diff --cc src/boot/efi/cpio.c
Simple merge

diff --cc src/boot/efi/stub.c
index 36becafa0836e71cb90d1b991f5ec287ea8fa29e,afcc106b52dabeb27fa0e68bf5fb97b82e7ebd84..f335d3782d58b4accde45233807107dff2064bf5
--- 1/src/boot/efi/stub.c
--- 2/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@@ -68,12 -68,12 +68,12 @@@ static EFI_STATUS combine_initrd
  
                  /* Order matters, the real initrd must come first, since it might include microcode updates
                   * which the kernel only looks for in the first cpio archive */
 -                CopyMem(p, PHYSICAL_ADDRESS_TO_POINTER(initrd_base), initrd_size);
 +                memcpy(p, PHYSICAL_ADDRESS_TO_POINTER(initrd_base), initrd_size);
                  p += initrd_size;
  
-                 pad = ALIGN_TO(initrd_size, 4) - initrd_size;
+                 pad = ALIGN4(initrd_size) - initrd_size;
                  if (pad > 0)  {
 -                        ZeroMem(p, pad);
 +                        memset(p, 0, pad);
                          p += pad;
                  }
          }

diff --cc src/fundamental/macro-fundamental.h
Simple merge