From patchwork Fri Mar 20 19:13:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Williams X-Patchwork-Id: 452754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 3D7E6140140 for ; Sat, 21 Mar 2015 06:14:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7F8DA33CCC; Fri, 20 Mar 2015 19:14:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qdtti4fVXal9; Fri, 20 Mar 2015 19:14:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 07D5C33CAE; Fri, 20 Mar 2015 19:14:32 +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 807B21C2357 for ; Fri, 20 Mar 2015 19:14:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7CC589259C for ; Fri, 20 Mar 2015 19:14:27 +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 o0CwZgj4bZcX for ; Fri, 20 Mar 2015 19:14:26 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yk0-f174.google.com (mail-yk0-f174.google.com [209.85.160.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id C5F9E9259B for ; Fri, 20 Mar 2015 19:14:26 +0000 (UTC) Received: by ykcn8 with SMTP id n8so47008671ykc.3 for ; Fri, 20 Mar 2015 12:14:26 -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=uvFqfz/bEjNgdiPGSRbzwD3yjMC86Xkw7ftifVVuoQ0=; b=EuwV/VABxJknjWc89CrPVJr19zaOluxEcm13z5tlpHFDvPKdZyQYRlcK9zEVD6TC/m JwtNeTxUFOsZ01X0Qq6vrmMt+oU0CTuCYk61+ZHCe6zc1MQmIXGaGvYqFQ0UrWSFSsXS Qwg5E9SJ5qESnV31anXE/PiOSADkcjHZSS7SJSGiXnx3E2mU/llrn95T/gKKPM14bxox 5nSilI+XD/4JcTZ82WOgR9IRtoLRgcIYEUBzcSVXrgAWVX/YGFz1ONdaJTlvtAZhCxDF vKTIsDAV6YcXbfplLgRr7m2lNfb1SKH3CBm7X6OWbOT8E5UQpOXwr5cYV6z3HZgXxZYZ JYYw== X-Gm-Message-State: ALoCoQlZgiJLqdYI18T5WJFeT64s9kliEpUzPG/jU/muHB2M7nkyvDkxIjMMySF9m02xocYiUZY4 X-Received: by 10.236.44.98 with SMTP id m62mr48027485yhb.136.1426878866120; Fri, 20 Mar 2015 12:14:26 -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 c5sm4193119yhf.29.2015.03.20.12.14.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 12:14:25 -0700 (PDT) From: Mike Williams To: buildroot@busybox.net Date: Fri, 20 Mar 2015 15:13:52 -0400 Message-Id: <1426878856-15747-2-git-send-email-mike@mikebwilliams.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426878856-15747-1-git-send-email-mike@mikebwilliams.com> References: <1426878856-15747-1-git-send-email-mike@mikebwilliams.com> Subject: [Buildroot] [PATCH v2 01/25] lighttpd: use upstream systemd service file 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" Signed-off-by: Mike Williams --- package/lighttpd/lighttpd.mk | 6 +++--- package/lighttpd/lighttpd.service | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 package/lighttpd/lighttpd.service diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 8f34561..cdbf91d 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -84,12 +84,12 @@ define LIGHTTPD_INSTALL_INIT_SYSV endef define LIGHTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/lighttpd/lighttpd.service \ - $(TARGET_DIR)/etc/systemd/system/lighttpd.service + $(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../lighttpd.service \ + ln -fs ../../../../usr/lib/systemd/lighttpd.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service endef diff --git a/package/lighttpd/lighttpd.service b/package/lighttpd/lighttpd.service deleted file mode 100644 index 0ca5357..0000000 --- a/package/lighttpd/lighttpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Lighttpd Web Server -After=network.target - -[Service] -ExecStart=/usr/sbin/lighttpd-angel -f /etc/lighttpd/lighttpd.conf -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target