diff --git a/meta-digi-dey/recipes-core/systemd/systemd/0001-socket-util-fix-getpeergroups-assert-fd-8080.patch b/meta-digi-dey/recipes-core/systemd/systemd/0001-socket-util-fix-getpeergroups-assert-fd-8080.patch deleted file mode 100644 index d3b0088a0..000000000 --- a/meta-digi-dey/recipes-core/systemd/systemd/0001-socket-util-fix-getpeergroups-assert-fd-8080.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8745e605135fed3e556558a8ddb783a96765b6e7 Mon Sep 17 00:00:00 2001 -From: Vito Caputo -Date: Sat, 3 Feb 2018 03:09:08 -0800 -Subject: [PATCH] socket-util: fix getpeergroups() assert(fd) (#8080) - -Don't assert on zero-value fds. - -Fixes #8075. ---- - src/basic/socket-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c -index 2c70cad..bd3cf6f 100644 ---- a/src/basic/socket-util.c -+++ b/src/basic/socket-util.c -@@ -1008,7 +1008,7 @@ int getpeergroups(int fd, gid_t **ret) { - socklen_t n = sizeof(gid_t) * 64; - _cleanup_free_ gid_t *d = NULL; - -- assert(fd); -+ assert(fd >= 0); - assert(ret); - - for (;;) { --- -2.7.4 - diff --git a/meta-digi-dey/recipes-core/systemd/systemd/0021-systemd-udevd.service.in-Set-MountFlags-as-shared-to.patch b/meta-digi-dey/recipes-core/systemd/systemd/0021-systemd-udevd.service.in-Set-MountFlags-as-shared-to.patch deleted file mode 100644 index bf5fdead7..000000000 --- a/meta-digi-dey/recipes-core/systemd/systemd/0021-systemd-udevd.service.in-Set-MountFlags-as-shared-to.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 63a29080c6a2f6e235d19e2ed303e52706c2c74e Mon Sep 17 00:00:00 2001 -From: Jun Zhu -Date: Thu, 26 Apr 2018 15:43:45 +0800 -Subject: [PATCH] systemd-udevd.service.in: Set MountFlags as shared to fix the - automount problem - -Use "shared" mode to ensure that mounts and unmounts - are propagated from systemd's namespace to the service's namespace. - -It will fix the automount problem from v234 - -The original commit to set the mode to "slave" is -the commit c2c13f2df42e0691aecabe3979ea81cd7faa35c7 -"unit: turn off mount propagation for udevd" - -Upstream-Status: Inappropriate [i.MX specific] - -Signed-off-by: Jun Zhu ---- - units/systemd-udevd.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in -index fc037b5..f65b77c 100644 ---- a/units/systemd-udevd.service.in -+++ b/units/systemd-udevd.service.in -@@ -24,7 +24,7 @@ ExecStart=@rootlibexecdir@/systemd-udevd - KillMode=mixed - WatchdogSec=3min - TasksMax=infinity --MountFlags=slave -+MountFlags=shared - MemoryDenyWriteExecute=yes - RestrictRealtime=yes - RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6 --- -2.7.4 - diff --git a/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend b/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend index 47445d3d8..4f525f188 100644 --- a/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend +++ b/meta-digi-dey/recipes-core/systemd/systemd_%.bbappend @@ -1,8 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI += "file://0021-systemd-udevd.service.in-Set-MountFlags-as-shared-to.patch \ - file://0001-socket-util-fix-getpeergroups-assert-fd-8080.patch \ -" + #FIX-it: Workaround as missing ending slash in FIRMWARE_PATH [YOCIMX-2831] EXTRA_OEMESON_remove = "-Dfirmware-path=${nonarch_base_libdir}/firmware "