From patchwork Mon Feb 8 22:50:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabe Evans X-Patchwork-Id: 580535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 10943140BA6 for ; Tue, 9 Feb 2016 09:58:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=hashrabbit.co header.i=@hashrabbit.co header.b=stUwrsrc; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2E6048C9BC; Mon, 8 Feb 2016 22:58:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WRLhRk8CZaKu; Mon, 8 Feb 2016 22:58:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2DCA08D6FC; Mon, 8 Feb 2016 22:58:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4B00E1C0FC5 for ; Mon, 8 Feb 2016 22:58:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4693E8D6FC for ; Mon, 8 Feb 2016 22:58:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y+D7rl3DTAkP for ; Mon, 8 Feb 2016 22:58:25 +0000 (UTC) X-Greylist: delayed 00:06:37 by SQLgrey-1.7.6 Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id 959508C9BC for ; Mon, 8 Feb 2016 22:58:25 +0000 (UTC) Received: by mail-pa0-f49.google.com with SMTP id ho8so80644468pac.2 for ; Mon, 08 Feb 2016 14:58:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hashrabbit.co; s=google; h=from:to:cc:subject:date:message-id; bh=Va5j0yWpSJUfR2wCDFLzy6FWfRoC4avSVZJIa35R268=; b=stUwrsrcVYvhHZ6UkzCYuXjhpwZ8P79ST4f1JUw/CeLdrb5N3Jx+WsG837y3b5vV5e iX/gdrQcBdLOKHBTK/u1NEjfKfCJa4ouNKNx/RDV1CvgfXbK3K5bdaBWUVRrjRdXUc1Y g+fIbAE+UuAyrM5NYVM8eQwk0nLyJOJgALDO8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Va5j0yWpSJUfR2wCDFLzy6FWfRoC4avSVZJIa35R268=; b=T3lMM+ulu3ZyMKqGSSMPeRd/38Aem/HpT7mPexgZf1Rw6N/b0NGsLOmQ5vMSQwtg/U wDC7yyT7p57mD1zTMixNTBTkhrw3eTKa0nie2rlCuidKMmD0bb0D7NPwyEXK+giIq+PH sod/6EMz3WglJ9zEcRhuMFk6+1LvMZPkMOSBpl4RT6zvSKrgpNkWiis5bTMaCEk9/2iy pb8JyuAGWJB99P1oA8gif80SuawaFWysr4GKNP3Hzz+LTWHa9iWzcyEm+pVh7juxppDx S2JFwiswi+FKD1VXKMZDWg7xL1GUgdoICV6cG3w44duuLUPsYKMG7tp99/hIkjal0iVF qafg== X-Gm-Message-State: AG10YOQfuaB8inH9A//hweXTlSnFhAlmGZCmrAIF/QxBwVJZW0SqDLeP7Jk+Gi/WSQ5J6A== X-Received: by 10.66.63.104 with SMTP id f8mr45944435pas.41.1454971907688; Mon, 08 Feb 2016 14:51:47 -0800 (PST) Received: from lab.us-west-1.compute.internal (ec2-54-183-105-171.us-west-1.compute.amazonaws.com. [54.183.105.171]) by smtp.gmail.com with ESMTPSA id t29sm45741636pfi.8.2016.02.08.14.51.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Feb 2016 14:51:46 -0800 (PST) From: Gabe Evans To: buildroot@buildroot.org Date: Mon, 8 Feb 2016 22:50:31 +0000 Message-Id: <1454971831-11139-1-git-send-email-gabe@hashrabbit.co> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH 1/1] package/systemd: fix dbus activation X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Various DBus activated services fail to start with errors similar to: Unit dbus-org.freedesktop.hostname1.service failed to load: File exists. The message itself is rather vague and can be seen as a warning in systemd-networkd logs. Meanwhile, tools like hostnamectl don't work at all. The post-install target hook SYSTEMD_SANITIZE_PATH_IN_UNITS was replacing symlinks with duplicate files. The sed command could have used --follow-symlinks to avoid this but I instead chose to remove the hook since this fix doesn't seem to be needed anymore. Some configure options are also removed: * --with-dbuspolicydir, --with-dbussessionservicedir, and --with-dbussystemservicedir are no longer needed since these are defaults in recent releases. * --disable-dbus has no effect when combined with --disable-tests. The option itself only applies to tests, not the runtime. Signed-off-by: Gabe Evans Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e432069..05121cf 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -32,14 +32,10 @@ SYSTEMD_CONF_OPTS += \ --disable-selinux \ --disable-pam \ --disable-libcryptsetup \ - --with-dbuspolicydir=/etc/dbus-1/system.d \ - --with-dbussessionservicedir=/usr/share/dbus-1/services \ - --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ --disable-efi \ --disable-gnuefi \ --disable-ldconfig \ --disable-tests \ - --disable-dbus \ --without-python SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto @@ -150,16 +146,10 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef -define SYSTEMD_SANITIZE_PATH_IN_UNITS - find $(TARGET_DIR)/lib/systemd/system -name '*.service' \ - -exec $(SED) 's,$(HOST_DIR),,g' {} \; -endef - SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK \ - SYSTEMD_INSTALL_RESOLVCONF_HOOK \ - SYSTEMD_SANITIZE_PATH_IN_UNITS + SYSTEMD_INSTALL_RESOLVCONF_HOOK define SYSTEMD_USERS systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal