From 9ee883f2f9f36f6d5cca56ac5f179468dfa5b686 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 29 Aug 2013 12:30:24 +1000 Subject: systemd: use /bin/mkdir instead of host mkdir path Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold --- ...-Use-bin-mkdir-instead-of-host-mkdir-path.patch | 31 ++++++++++++++++++++++ meta/recipes-core/systemd/systemd_206.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch (limited to 'meta/recipes-core/systemd') diff --git a/meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch b/meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch new file mode 100644 index 0000000000..25988fc5a5 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch @@ -0,0 +1,31 @@ +From 5599ab4ae3fe74cdd9699f2874badf241f0148fe Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Wed, 28 Aug 2013 19:09:49 -0700 +Subject: [PATCH] Use /bin/mkdir instead of host mkdir path + +If the host system has /usr/bin/mkdir, autoconf would set MKDIR_P to +/usr/bin/mkdir when it should be /bin/mkdir. As a result, the +kmod-static-nodes service fails to start on the target because +/usr/bin/mkdir doesn't exist. This has been observed when building +systemd on Arch Linux host. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Jonathan Liu +--- + units/kmod-static-nodes.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in +index d8a8420..1daed5f 100644 +--- a/units/kmod-static-nodes.service.in ++++ b/units/kmod-static-nodes.service.in +@@ -14,5 +14,5 @@ ConditionCapability=CAP_MKNOD + [Service] + Type=oneshot + RemainAfterExit=yes +-ExecStartPre=@MKDIR_P@ /run/tmpfiles.d ++ExecStartPre=/bin/mkdir -p /run/tmpfiles.d + ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf +-- +1.8.3.4 + diff --git a/meta/recipes-core/systemd/systemd_206.bb b/meta/recipes-core/systemd/systemd_206.bb index f05aa1b6d9..75bdc61fbd 100644 --- a/meta/recipes-core/systemd/systemd_206.bb +++ b/meta/recipes-core/systemd/systemd_206.bb @@ -19,6 +19,7 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ file://0001-use-CAP_MKNOD-ConditionCapability.patch \ + file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \ file://touchscreen.rules \ ${UCLIBCPATCHES} \ file://00-create-volatile.conf \ -- cgit 1.2.3-korg