public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] cups: Add link at /etc/cups pointing to configuration
Date: Mon, 25 Jul 2022 16:02:04 +0000	[thread overview]
Message-ID: <20220725160204.3885100-2-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20220725160204.3885100-1-michael.tremer@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

This is needed because cups-pdf is looking for its configuration file in
/etc/cups.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/packages/cups | 1 +
 lfs/cups                       | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 18987be0e..65ad4f418 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,3 +1,4 @@
+etc/cups
 etc/dbus-1/system.d/cups.conf
 etc/pam.d/cups
 etc/rc.d/init.d/cups
diff --git a/lfs/cups b/lfs/cups
index d333532e3..312f165d8 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 27
+PAK_VER    = 28
 
 DEPS       = avahi cups-filters dbus ghostscript
 
@@ -104,5 +104,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	$(call INSTALL_INITSCRIPTS,$(SERVICES))
 	cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
 
+	# Install convenience link
+	ln -svf /var/ipfire/cups /etc/cups
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.30.2


      reply	other threads:[~2022-07-25 16:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-25 16:02 [PATCH 1/2] cups-pdf: New package Michael Tremer
2022-07-25 16:02 ` Michael Tremer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220725160204.3885100-2-michael.tremer@ipfire.org \
    --to=michael.tremer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox