pkgsMusl.systemdMinimal: fix build

Use latest patches from OpenEmbedded.  pkgsMusl.systemd doesn't build
yet because pkgsMusl.libnetfilter_conntrack is currently broken.

pkgs/os-specific/linux/systemd/default.nix

@@ -181,8 +181,8 @@ stdenv.mkDerivation {
   ] ++ lib.optional stdenv.hostPlatform.isMusl (
     let
       oe-core = fetchzip {
-        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2";
-        sha256 = "1jixya4czkr5p5rdcw3d6ips8zzr82dvnanvzvgjh67730scflya";
+        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-7e35a575ef09a85e625a81e0b4d80b020e3e3a92.tar.bz2";
+        sha256 = "0dvz4685nk0y7nnq3sr2q8ab3wfx0bi8ilwcgn0h6kagwcnav2n8";
       };
       musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
     in
@@ -191,7 +191,6 @@ stdenv.mkDerivation {
       (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch")
       (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch")
       (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch")
-      (musl-patches + "/0006-Include-netinet-if_ether.h.patch")
       (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
       (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch")
       (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch")
@@ -210,9 +209,7 @@ stdenv.mkDerivation {
       (musl-patches + "/0025-Handle-__cpu_mask-usage.patch")
       (musl-patches + "/0026-Handle-missing-gshadow.patch")
       (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
-
-      # Being discussed upstream: https://lists.openembedded.org/g/openembedded-core/topic/86411771#157056
-      ./musl.diff
+      (musl-patches + "/0001-Adjust-for-musl-headers.patch")
     ]
   );
 

pkgs/os-specific/linux/systemd/musl.diff

@@ -1,12 +0,0 @@
-diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
-index ef3527e..cc1ba23 100644
---- a/src/shared/mount-setup.c
-+++ b/src/shared/mount-setup.c
-@@ -32,6 +32,7 @@
- #include "strv.h"
- #include "user-util.h"
- #include "virt.h"
-+#include "missing_type.h"
- 
- typedef enum MountMode {
-         MNT_NONE           = 0,