From patchwork Wed Jun 24 20:43:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1316575 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=GFanE5Cz; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49sZrC2ff8z9sSt for ; Thu, 25 Jun 2020 06:44:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D01FE864F5; Wed, 24 Jun 2020 20:44:09 +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 gBATeS5tqH91; Wed, 24 Jun 2020 20:44:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0113E875EE; Wed, 24 Jun 2020 20:44:08 +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 D7F761BF2AA for ; Wed, 24 Jun 2020 20:44:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D3855877DC for ; Wed, 24 Jun 2020 20:44:02 +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 KHJtRwJJfMq1 for ; Wed, 24 Jun 2020 20:44:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 77718877D6 for ; Wed, 24 Jun 2020 20:44:01 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z13so3603827wrw.5 for ; Wed, 24 Jun 2020 13:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HS+1UxahAVRBS1xabVyKkNQmhoVvlLHnu8zJsfN/0ms=; b=GFanE5CzOE7JAG752fGw8Fz8dPD3FK3QGbtGv+td386TjiP5wti94AtUm8qzIpIGVK kieHhLWVRouF/HNQEN2capy23PhEmaB4CAszutIzuV7nI+aEnLnTKEuyp+n14F77duzQ /f3/wQ+BtFCGddfoY8tgK7OPnJl6lYJeeugPI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HS+1UxahAVRBS1xabVyKkNQmhoVvlLHnu8zJsfN/0ms=; b=H7wte1EomPgHy60cda+kTC/07hcGRBIOO5UR9ZtMo6/p7/5pCGKRGYky7r+XK3vx9g AYmCiPkPh+nuBXyIbV9cVsci6EI4msVt5WesCKfJOrO9w7AQj8OKs4xwNez7bdHgurFd sdStPltcKCxeRcKmessGnLqMx1UPlCbKKGiAoHnlLn2I4seMVqhyBwJYLt3jGkbvLaSA owuXk1uXB5OLbwq5IOYzivcZzUIcq3OHH/Hrjnx9dG/FeK3/6OOV4HOvSLufY2czkQRW t8gu87FkXHzbkGKph9GvslKa2/u/alM9Lz2/oZc6XNFNASe/nTYbRYx6yuJeHAoGn+Qr Re3w== X-Gm-Message-State: AOAM530BWrXPVMXuLabwtjqpsnPjBp+Ft2u8ndOjm2CWEKsI67sg3WBE nHbNKc3UPr+eTfqCRIdft1ddMdLZc8/QqQ== X-Google-Smtp-Source: ABdhPJxihtDrobo7CkZ7bQEv5TVzfQY2WtWmYY0L5pRBVnaYTztWXC5FbIOKQ2LD08CjsIGPgECjRA== X-Received: by 2002:a5d:54c9:: with SMTP id x9mr34704134wrv.247.1593031439467; Wed, 24 Jun 2020 13:43:59 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id 11sm9643996wmg.41.2020.06.24.13.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 13:43:58 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 24 Jun 2020 22:43:43 +0200 Message-Id: <20200624204347.797088-4-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200624204347.797088-1-angelo@amarulasolutions.com> References: <20200624204347.797088-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 3/7] package/cups: fix cups service X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Cups service for systemv was erroneously installed in /etc/rcX.d and therefore not working. This patch adds also a buildroot style systemv init script instead of using the example provided by the package. Signed-off-by: Angelo Compagnucci --- package/cups/S81cupsd | 48 +++++++++++++++++++++++++++++++++++++++++++ package/cups/cups.mk | 9 +++++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 package/cups/S81cupsd diff --git a/package/cups/S81cupsd b/package/cups/S81cupsd new file mode 100644 index 0000000000..13b43ded5e --- /dev/null +++ b/package/cups/S81cupsd @@ -0,0 +1,48 @@ +#!/bin/sh + +DAEMON="cupsd" +PIDFILE="/var/run/$DAEMON.pid" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ + -- -C /etc/cups/cupsd.conf -s /etc/cups/cups-files + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 18f01d8484..cff198b06a 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -21,7 +21,8 @@ CUPS_CONF_OPTS = \ --with-docdir=/usr/share/cups/doc-root \ --disable-gssapi \ --disable-pam \ - --libdir=/usr/lib + --libdir=/usr/lib \ + --with-rcdir=no CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ host-autoconf \ @@ -71,4 +72,10 @@ else CUPS_CONF_OPTS += --disable-avahi endif +define CUPS_INSTALL_INIT_SYSV + $(RM) $(TARGET_DIR)/etc/init.d/cups + $(INSTALL) -D -m 0755 package/cups/S81cupsd \ + $(TARGET_DIR)/etc/init.d/S81cupsd +endef + $(eval $(autotools-package))