systemd: resolved was renamed to resolve in meson build

Message ID 20180212210240.GA19381@waldemar-brodkorb.de
State Accepted
Headers show
Series
  • systemd: resolved was renamed to resolve in meson build
Related show

Commit Message

Waldemar Brodkorb Feb. 12, 2018, 9:02 p.m.
While the conversion to meson, this seems to be missed.
Found while trying to build systemd with uClibc toolchain.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/systemd/systemd.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni Feb. 13, 2018, 9:54 p.m. | #1
Hello,

On Mon, 12 Feb 2018 22:02:41 +0100, Waldemar Brodkorb wrote:
> While the conversion to meson, this seems to be missed.
> Found while trying to build systemd with uClibc toolchain.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/systemd/systemd.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Patch

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index a6c4b33..2bc665e 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -298,10 +298,10 @@  SYSTEMD_CONF_OPTS += -Dnetworkd=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
-SYSTEMD_CONF_OPTS += -Dresolved=true
+SYSTEMD_CONF_OPTS += -Dresolve=true
 SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager
 else
-SYSTEMD_CONF_OPTS += -Dresolved=false
+SYSTEMD_CONF_OPTS += -Dresolve=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y)