From patchwork Sat Jan 18 19:23:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 312317 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 311962C00A3 for ; Sun, 19 Jan 2014 06:24:28 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8E0938A963; Sat, 18 Jan 2014 19:24:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mdj6h3-v4c6o; Sat, 18 Jan 2014 19:24:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E448493DA1; Sat, 18 Jan 2014 19:24:17 +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 343B91CE8D5 for ; Sat, 18 Jan 2014 19:24:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2ED3F82874 for ; Sat, 18 Jan 2014 19:24:07 +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 kn73srzQSpQp for ; Sat, 18 Jan 2014 19:24:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7F20D825A8 for ; Sat, 18 Jan 2014 19:24:06 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id z12so5590702wgg.6 for ; Sat, 18 Jan 2014 11:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yaovF68b9SbStH/qIC6GD1ySLTbZSeLS7xR6Cm1ZYM4=; b=Qd8lH3B91KtlGJYlLGqZ+ZE8hXLVS16v1WSfVOgUjL9yKVErf2psEzmDRRPdEN5m5u LL9fNLHLJ+p+RdwRQvAo41HJumLIwfIGfx82rNIyMqmUQgKcgoMuilvSnkRO7Xgdx3ST AhwcGko2UZh1QK01fc8cJzTxjYGoIrRFF88AG9F6P35SY3wPc35TRaS2TV/K62rA8ZmF fp/X9i8rLodCdbR3vcy3VUU3nNuyiW/aOjw9Kb8QpkMz1xdVqf27+uy+HR5j+pxypiYV gaZC+DE9541t7I/IAQr3pNHrbyLNaIN/ukjtkFWwbqOuCQHSFSuGxRvfzpWv5tI34b34 LDjA== X-Received: by 10.180.76.168 with SMTP id l8mr3647575wiw.40.1390073045087; Sat, 18 Jan 2014 11:24:05 -0800 (PST) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id po3sm13322105wjc.3.2014.01.18.11.24.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Jan 2014 11:24:04 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Sat, 18 Jan 2014 20:23:44 +0100 Message-Id: <1390073027-14239-8-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1390073027-14239-1-git-send-email-s.martin49@gmail.com> References: <1390073027-14239-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH 07/10] connman: add systemd unit file X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net This patch cleans up the init material installation: - it uses the *_INSTALL_INIT_SYSV infra instead of the custom hook; - it add and install the systemd unit file Signed-off-by: Samuel Martin --- package/connman/connman.mk | 10 ++++++++-- package/connman/connman.service | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 package/connman/connman.service diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 64c1f0e..9161cce 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -24,11 +24,17 @@ CONNMAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \ $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) -define CONNMAN_INSTALL_INITSCRIPT +define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef -CONNMAN_POST_INSTALL_TARGET_HOOKS = CONNMAN_INSTALL_INITSCRIPT +define CONNMAN_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/connman/connman.service \ + $(TARGET_DIR)/etc/systemd/system/connman.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../connman.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/connman.service +endef ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y) CONNMAN_CONF_OPT += --enable-client diff --git a/package/connman/connman.service b/package/connman/connman.service new file mode 100644 index 0000000..bb6b3c0 --- /dev/null +++ b/package/connman/connman.service @@ -0,0 +1,12 @@ +[Unit] +Description=Connection service +After=syslog.target + +[Service] +Type=dbus +BusName=net.connman +Restart=on-failure +ExecStart=/usr/bin/connmand -n + +[Install] +WantedBy=multi-user.target