[Buildroot] [PATCH v2 3/7] package/cups: bump to version 2.3.3

Thomas Petazzoni thomas.petazzoni at bootlin.com
Sat Jun 20 20:35:40 UTC 2020


Hello Angelo,

On Fri, 19 Jun 2020 16:57:15 +0200
Angelo Compagnucci <angelo at amarulasolutions.com> wrote:

> This patch bumps cups to version 2.3.3.
> While bumping, fixing also the wrong installation of service files:
> the rcdir was left to the default value, that means installing the
> service files into the /etc/rcX.d directory.
> Adding also a simplified systemv service file for loading cupsd.

Again, this seems to be mixing up different changes together in the
same commit. If I understand correctly what you're saying, you should
have at least three different commits:

 - Fix the rcdir value, due to which the systemd service file was not
   installed at the right place.

 - Provide and install an init script

 - Bump the version.

> Signed-off-by: Michael Trimarchi <michael at amarulasolutions.com>
> Signed-off-by: Angelo Compagnucci <angelo at amarulasolutions.com>

Same issue as PATCH 2/7 about author/SoB.


> diff --git a/package/cups/S81cupsd b/package/cups/S81cupsd
> new file mode 100644
> index 0000000000..f527d55f1e
> --- /dev/null
> +++ b/package/cups/S81cupsd

Please take inspiration from package/busybox/S01syslogd.

> -CUPS_VERSION = 2.3.1
> +CUPS_VERSION = 2.3.3
>  CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
>  CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
>  CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception
> @@ -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

	--without-rcdir

> +define CUPS_INSTALL_INIT_SYSV
> +	@$(RM) $(TARGET_DIR)/etc/init.d/cups

This should also be done in the systemd case I believe, and should not
have the @.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


More information about the buildroot mailing list