From patchwork Tue Apr 21 17:50:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Williams X-Patchwork-Id: 463442 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 2EDE2140133 for ; Wed, 22 Apr 2015 03:50:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 52AC5867BF; Tue, 21 Apr 2015 17:50:57 +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 S2o1NogK-Ztj; Tue, 21 Apr 2015 17:50:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D259886245; Tue, 21 Apr 2015 17:50:55 +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 F2FB81C26F9 for ; Tue, 21 Apr 2015 17:50:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ED72C8620E for ; Tue, 21 Apr 2015 17:50:54 +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 8kcE0wkSPvdo for ; Tue, 21 Apr 2015 17:50:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yk0-f177.google.com (mail-yk0-f177.google.com [209.85.160.177]) by whitealder.osuosl.org (Postfix) with ESMTPS id A325E8629F for ; Tue, 21 Apr 2015 17:50:52 +0000 (UTC) Received: by ykep21 with SMTP id p21so23463135yke.3 for ; Tue, 21 Apr 2015 10:50:52 -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=rNxp2+qBXBvMCULUzs2C6pp8RCB1DjYyDjYu2pxvJx0=; b=ebvyZk4rg7OMzb8KZF/WG4jKVHLSWJOupXnu/YF6mzgD31KoIrkrDq7ylS5/PswDru N2BB7eBS8Pf63lQ4p8uLU6VOgX0waZiye5FcAMcG45GKd9+uRVYgbX+KjBjWEnaRUnvv PnEj81JHABm0nRRuztBkdrbyEtuk/0Ak34VRUqHcPNEAZgBs84W10gLaDetyJ38WK6C7 CFNW3rtkc4hwj9JXcpcbIQbGVUn7UTEFx2BRioAbMNsNTfmOrnkFCiZ+2GEW0yKeD74n nhYQ7XGHClgw/MvFhr/xX3dXGLnkuhgjvNzpDUTJ4Uf9YieWaQsbcW9Q/9j17EVNvuFN jasw== X-Gm-Message-State: ALoCoQk8pTfXpkUQno/yOH6GokHdQKcMPHChP6SDccNZtQLLxdok7Yr/h9TCzPJGb5etafHfZcCK X-Received: by 10.236.26.70 with SMTP id b46mr18414680yha.18.1429638651940; Tue, 21 Apr 2015 10:50:51 -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 v11sm1895341yhn.49.2015.04.21.10.50.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Apr 2015 10:50:50 -0700 (PDT) From: Mike Williams To: buildroot@busybox.net Date: Tue, 21 Apr 2015 13:50:34 -0400 Message-Id: <1429638638-28695-2-git-send-email-mike@mikebwilliams.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1429638638-28695-1-git-send-email-mike@mikebwilliams.com> References: <1429638638-28695-1-git-send-email-mike@mikebwilliams.com> Subject: [Buildroot] [PATCH 1/5] 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 --- package/avahi/0002-disable-systemd-support.patch | 22 ---------------------- package/avahi/avahi.mk | 12 ++++++++++-- 2 files changed, 10 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..bd236ca 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -88,6 +88,12 @@ AVAHI_DEPENDENCIES = \ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \ host-pkgconf host-gettext +AVAHI_CFLAGS = $(TARGET_CFLAGS) + +ifneq ($(BR2_PACKAGE_SYSTEMD),y) +AVAHI_CFLAGS += -DDISABLE_SYSTEMD +endif + ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),) AVAHI_DEPENDENCIES += libdaemon else @@ -154,6 +160,8 @@ else AVAHI_CONF_OPTS += --disable-python-dbus endif +AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" + AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl) define AVAHI_USERS @@ -185,10 +193,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 \