From patchwork Thu Mar 19 17:56:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Williams X-Patchwork-Id: 452119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3731314010F for ; Fri, 20 Mar 2015 04:57:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F6BD9226F; Thu, 19 Mar 2015 17:57: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 gMJHdvqumuq8; Thu, 19 Mar 2015 17:57:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5CEB892275; Thu, 19 Mar 2015 17:57:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DE7C31C2607 for ; Thu, 19 Mar 2015 17:57:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DB92A92149 for ; Thu, 19 Mar 2015 17:57:11 +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 YSlDNn4WfOII for ; Thu, 19 Mar 2015 17:57:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yk0-f172.google.com (mail-yk0-f172.google.com [209.85.160.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id EAB089221C for ; Thu, 19 Mar 2015 17:57:10 +0000 (UTC) Received: by ykfs63 with SMTP id s63so31362388ykf.2 for ; Thu, 19 Mar 2015 10:57:10 -0700 (PDT) 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:in-reply-to :references; bh=+ryaeF0sO5A6WqNgmxgzpGK1DEsIU6W7p4n+IoENXx0=; b=Yc5S6PNlmpcXUf0If3jr34w8CF2UpF8JoPPeeaPyoC0RC389y3W2eHgdOKqa6uNwVL V5uKk1qXFp9kJhJca4lYrETS0+MMf6dsf1KSsC9WAErzj43CPuQthU67szyShnkbwB0J /6dTtOd+7ZHE9jy3RrNG1YGHjf+5+FHomD073fk2GXWClT6/RsCpgkv0b14sWc4bvmr8 Mvah7drN66J/srWfAxDeNLUawbbFj3pl0O9d8GHFwKnrylKPSs06qxAPJzBomZ9n8ZpW KaI9qgm1oi+6mPEEzUqGUF0khnd+nRhnYJno+YScHJcVeP+bDnZYAvYZAfxiZUcKEy3Q yupw== X-Gm-Message-State: ALoCoQl1FEuYlM+/E9yytPs07Te6eUDPC1EDsXWWheVt3g9xgu7x8fGJYIh6XSJ/SygLXbNyMupg X-Received: by 10.236.41.78 with SMTP id g54mr65759640yhb.112.1426787830292; Thu, 19 Mar 2015 10:57:10 -0700 (PDT) Received: from mikework.lifesafer.com (FUSE-DEDICATED-66-42-228-99.fuse.net. [66.42.228.99]) by mx.google.com with ESMTPSA id e48sm1527034yho.30.2015.03.19.10.57.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Mar 2015 10:57:09 -0700 (PDT) From: Mike Williams To: buildroot@busybox.net Date: Thu, 19 Mar 2015 13:56:38 -0400 Message-Id: <1426787807-29510-7-git-send-email-mike@mikebwilliams.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426787807-29510-1-git-send-email-mike@mikebwilliams.com> References: <1426787807-29510-1-git-send-email-mike@mikebwilliams.com> Subject: [Buildroot] [PATCH 06/15] avahi: systemd cleanups 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" * Move service files to /usr/lib/systemd/system/ * Only disable systemd support on non-systemd systems Signed-off-by: Mike Williams Reviewed-by: Steven Noonan Reviewed-by: Samuel Martin --- package/avahi/0002-disable-systemd-support.patch | 22 ---------------------- package/avahi/avahi.mk | 8 ++++++-- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 package/avahi/0002-disable-systemd-support.patch diff --git a/package/avahi/0002-disable-systemd-support.patch b/package/avahi/0002-disable-systemd-support.patch deleted file mode 100644 index 909795a..0000000 --- a/package/avahi/0002-disable-systemd-support.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] avahi-daemon: disable systemd support - -Disable systemd support as it isn't needed for BR, and uses SOCK_CLOEXEC -which isn't available on uClibc. - -Signed-off-by: Peter Korsgaard ---- - avahi-daemon/sd-daemon.h | 1 + - 1 file changed, 1 insertion(+) - -Index: avahi-0.6.27/avahi-daemon/sd-daemon.h -=================================================================== ---- avahi-0.6.27.orig/avahi-daemon/sd-daemon.h -+++ avahi-0.6.27/avahi-daemon/sd-daemon.h -@@ -66,6 +66,7 @@ extern "C" { - - See sd-daemon(7) for more information. - */ -+#define DISABLE_SYSTEMD /* no systemd support in BR */ - - #if __GNUC__ >= 4 - #define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 10c9915..3f0cbe9 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -88,6 +88,10 @@ AVAHI_DEPENDENCIES = \ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \ host-pkgconf host-gettext +ifneq ($(BR2_PACKAGE_SYSTEMD),y) +AVAHI_EXTRA_CFLAGS += -DDISABLE_SYSTEMD +endif + ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),) AVAHI_DEPENDENCIES += libdaemon else @@ -185,10 +189,10 @@ ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) define AVAHI_INSTALL_INIT_SYSTEMD mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs /lib/systemd/system/avahi-daemon.service \ + ln -fs /usr/lib/systemd/system/avahi-daemon.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service - ln -fs /lib/systemd/system/avahi-dnsconfd.service \ + ln -fs /usr/lib/systemd/system/avahi-dnsconfd.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \