Re: [ptxdist] [PATCH 1/4] p11-kit: add as new target package

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Feb 04, 2019 at 12:17:02PM +0100, Rouven Czerwinski wrote:
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  rules/p11-kit.in   |  23 +++++++++-
>  rules/p11-kit.make | 114 ++++++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 137 insertions(+)
>  create mode 100644 rules/p11-kit.in
>  create mode 100644 rules/p11-kit.make
> 
> diff --git a/rules/p11-kit.in b/rules/p11-kit.in
> new file mode 100644
> index 0000000..c6085be
> --- /dev/null
> +++ b/rules/p11-kit.in
> @@ -0,0 +1,23 @@
> +## SECTION=security
> +
> +menuconfig P11_KIT
> +	tristate
> +	select LIBFFI
> +	prompt "p11-kit                                 "
> +	help
> +	  Provides a way to load and enumerate PKCS#11 modules. Provides a
> +	  standard configuration setup for installing PKCS#11 modules in such a
> +	  way that they're discoverable.
> +
> +	  Also solves problems with coordinating the use of PKCS#11 by different
> +	  components or libraries living in the same process.
> +
> +if P11_KIT
> +
> +config P11_KIT_SYSTEMD_UNIT
> +	bool
> +	default y
> +	depends on SYSTEMD
> +	prompt "install systemd unit file for p11-kit"
> +
> +endif
> diff --git a/rules/p11-kit.make b/rules/p11-kit.make
> new file mode 100644
> index 0000000..3580d54
> --- /dev/null
> +++ b/rules/p11-kit.make
> @@ -0,0 +1,114 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Rouven Czerwinski <r.czerwinski@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_P11_KIT) += p11-kit
> +
> +#
> +# Paths and names
> +#
> +P11_KIT_VERSION	:= 0.23.15
> +P11_KIT_MD5	:= c4c3eecfe6bd6e62e436f62b51980749
> +P11_KIT		:= p11-kit-$(P11_KIT_VERSION)
> +P11_KIT_SUFFIX	:= tar.gz
> +P11_KIT_URL	:= https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)/$(P11_KIT).$(P11_KIT_SUFFIX)
> +P11_KIT_SOURCE	:= $(SRCDIR)/$(P11_KIT).$(P11_KIT_SUFFIX)
> +P11_KIT_DIR	:= $(BUILDDIR)/$(P11_KIT)
> +P11_KIT_LICENSE	:= BSD-3-Clause
> +
> +# ----------------------------------------------------------------------------
> +# Get
> +# ----------------------------------------------------------------------------
> +
> +#$(P11_KIT_SOURCE):
> +#	@$(call targetinfo)
> +#	@$(call get, P11_KIT)
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#P11_KIT_CONF_ENV	:= $(CROSS_ENV)
> +
> +#
> +# autoconf
> +#
> +P11_KIT_CONF_TOOL	:= autoconf
> +P11_KIT_CONF_OPT		:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--disable-trust-module \
> +	--disable-doc \
> +	--disable-doc-html \
> +	--disable-doc-pdf \
> +	--without-libtasn1 \
> +	--with-libffi \
> +	--with-systemd \
> +
> +#$(STATEDIR)/p11-kit.prepare:
> +#	@$(call targetinfo)
> +#	@$(call clean, $(P11_KIT_DIR)/config.cache)
> +#	cd $(P11_KIT_DIR) && \
> +#		$(P11_KIT_PATH) $(P11_KIT_ENV) \
> +#		./configure $(P11_KIT_CONF_OPT)
> +#	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/p11-kit.compile:
> +#	@$(call targetinfo)
> +#	@$(call world/compile, P11_KIT)
> +#	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/p11-kit.install:
> +#	@$(call targetinfo)
> +#	@$(call world/install, P11_KIT)
> +#	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/p11-kit.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, p11-kit)
> +	@$(call install_fixup, p11-kit,PRIORITY,optional)
> +	@$(call install_fixup, p11-kit,SECTION,base)
> +	@$(call install_fixup, p11-kit,AUTHOR,"Rouven Czerwinski <r.czerwinski@pengutronix.de>")
> +	@$(call install_fixup, p11-kit,DESCRIPTION,missing)
> +
> +	@$(call install_copy, p11-kit, 0, 0, 0755, -, /usr/bin/p11-kit)

> +	@$(call install_copy, p11-kit, 0, 0, 0755, -, /usr/libexec/p11-kit/p11-kit-remote)
> +	@$(call install_copy, p11-kit, 0, 0, 0755, -, /usr/libexec/p11-kit/p11-kit-server)
> +	@$(call install_copy, p11-kit, 0, 0, 0755, -, /usr/lib/pkcs11/p11-kit-client.so)

Break.

> +	@$(call install_link, p11-kit, libp11-kit.so.0.3.0, /usr/lib/p11-kit-proxy.so)

Break and move below the install lib. It makes more sense there.

Michael

> +
> +	@$(call install_lib,  p11-kit, 0, 0, 0644, libp11-kit)
> +	@$(call install_finish, p11-kit)
> +
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/p11-kit.clean:
> +#	@$(call targetinfo)
> +#	@$(call clean_pkg, P11_KIT)
> +
> +# vim: syntax=make
> -- 
> git-series 0.9.1
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de