From aa50243bd9ad37b18d2ca646bf1cf696f921fe7e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 6 May 2019 14:19:53 +0200 Subject: systemd: apply configuration change in main systemd recipe Since oe-core commit 3150253898ba ("systemd-conf: simplify creation of machine-specific configuration") systemd-conf no longer unpacks the systemd sources. Hence the patch which patches units/systemd-udevd.service.in does no longer apply. Apply the patch in the systemd recipe instead. The systemd-udevd.service file is only deployed in a package built from the systemd recipe anyway, hence this also makes sure that the patched file gets actually deployed. This essentially reverts commit 118f6b1b17b6 ("systemd: follow recipe split which added systemd-conf"). Signed-off-by: Stefan Agner --- recipes-core/systemd/systemd-conf_%.bbappend | 5 ----- recipes-core/systemd/systemd_%.bbappend | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 recipes-core/systemd/systemd-conf_%.bbappend create mode 100644 recipes-core/systemd/systemd_%.bbappend diff --git a/recipes-core/systemd/systemd-conf_%.bbappend b/recipes-core/systemd/systemd-conf_%.bbappend deleted file mode 100644 index 8ebb6cc..0000000 --- a/recipes-core/systemd/systemd-conf_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" - -SRC_URI += " \ - file://0001-systemd-udevd.service.in-set-MountFlags-shared.patch \ -" diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 0000000..8ebb6cc --- /dev/null +++ b/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" + +SRC_URI += " \ + file://0001-systemd-udevd.service.in-set-MountFlags-shared.patch \ +" -- cgit v1.2.3