[OE-core] [PATCH] systemd: fix build with resolved enabled

Burton, Ross ross.burton at intel.com
Wed Jun 26 15:06:32 UTC 2019


The patch doesn't have an Upstream-Status tag, and at no point do you
explain in the log that this is for musl, and results in resolved
being enabled in musl builds.

Ross

On Wed, 26 Jun 2019 at 09:36, Jörg Hofrichter <Joerg.Hofrichter at ni.com> wrote:
>
> From: Joerg Hofrichter <joerg.hofrichter at ni.com>
> Date: Wed, 26 Jun 2019 10:30:34 +0200
> Subject: [PATCH] systemd: fix build with resolved enabled
>
> Signed-off-by: Joerg Hofrichter <joerg.hofrichter at ni.com>
> ---
>  ...e-also-add-missing.h-needed-for-musl.patch | 25 +++++++++++++++++++
>  meta/recipes-core/systemd/systemd_242.bb      |  2 +-
>  2 files changed, 26 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-core/systemd/systemd/0026-resolve-also-add-missing.h-needed-for-musl.patch
>
> diff --git a/meta/recipes-core/systemd/systemd/0026-resolve-also-add-missing.h-needed-for-musl.patch b/meta/recipes-core/systemd/systemd/0026-resolve-also-add-missing.h-needed-for-musl.patch
> new file mode 100644
> index 0000000000..9c29944511
> --- /dev/null
> +++ b/meta/recipes-core/systemd/systemd/0026-resolve-also-add-missing.h-needed-for-musl.patch
> @@ -0,0 +1,25 @@
> +From afddcc9f6686b85380f2c4ac15f901012b725b1e Mon Sep 17 00:00:00 2001
> +From: Joerg Hofrichter <joerg.hofrichter at ni.com>
> +Date: Wed, 26 Jun 2019 08:04:50 +0000
> +Subject: [PATCH] resolve: also add missing.h (needed for musl)
> +
> +Signed-off-by: Joerg Hofrichter <joerg.hofrichter at ni.com>
> +---
> + src/resolve/resolvectl.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
> +index 1d2fc71309..b12c80f125 100644
> +--- a/src/resolve/resolvectl.c
> ++++ b/src/resolve/resolvectl.c
> +@@ -30,6 +30,7 @@
> + #include "strv.h"
> + #include "terminal-util.h"
> + #include "verbs.h"
> ++#include "missing.h"
> +
> + static int arg_family = AF_UNSPEC;
> + static int arg_ifindex = 0;
> +--
> +2.17.1
> +
> diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
> index 29f64b995a..4c72890d28 100644
> --- a/meta/recipes-core/systemd/systemd_242.bb
> +++ b/meta/recipes-core/systemd/systemd_242.bb
> @@ -53,6 +53,7 @@ SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.pa
>                 file://0024-test-json.c-define-M_PIl.patch \
>                 file://0025-fs-utilh-add-missing-sys-stat-include.patch \
>                 file://0001-do-not-disable-buffer-in-writing-files.patch \
> +               file://0026-resolve-also-add-missing.h-needed-for-musl.patch \
>                 "
>
>  PAM_PLUGINS = " \
> @@ -102,7 +103,6 @@ PACKAGECONFIG_remove_libc-musl = " \
>      nss \
>      nss-mymachines \
>      nss-resolve \
> -    resolved \
>      smack \
>      sysusers \
>      utmp \
> --
> 2.17.1
> National Instruments Dresden GmbH; Geschäftsführer (Managing Director): Dr. Thorsten Dräger; Sitz (Registered Office): Dresden; HRB (Commercial Register No.): 22081; Registergericht (Registration Court): Dresden
>
> This email and any attachments are intended only for the person to whom this email is addressed and may contain confidential and/or privileged information. If you received this email in error, please do not disclose the contents to anyone, but notify the sender by return email and delete this email (and any attachments) from your system.
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


More information about the Openembedded-core mailing list