From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 Jan 2025 17:01:31 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tYomo-0014FU-2Y for lore@lore.pengutronix.de; Fri, 17 Jan 2025 17:01:31 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tYomp-0004kt-8Z; Fri, 17 Jan 2025 17:01:31 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tYomT-0004M9-R0; Fri, 17 Jan 2025 17:01:09 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tYomT-000SGT-0g; Fri, 17 Jan 2025 17:01:09 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tYomT-005mwm-0X; Fri, 17 Jan 2025 17:01:09 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 17 Jan 2025 17:01:09 +0100 Message-Id: <20250117160109.1379785-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250113122357.3498138-1-r.czerwinski@pengutronix.de> References: <20250113122357.3498138-1-r.czerwinski@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] softhsm: add target package X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Rouven Czerwinski Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as b6017bdde7ad268d4df170da61242a68cc0ad23a. Michael [sent from post-receive hook] On Fri, 17 Jan 2025 17:01:09 +0100, Rouven Czerwinski wrote: > We had softhsm as a host-package, add it as a target package. This is > useful to provide a development pkcs11 environment. Also remove the > duplicate SOFTHSM definitions from the host package. > > Signed-off-by: Rouven Czerwinski > Message-Id: <20250113122357.3498138-1-r.czerwinski@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-softhsm.make b/rules/host-softhsm.make > index b352f81628b4..67d9c5ab8f96 100644 > --- a/rules/host-softhsm.make > +++ b/rules/host-softhsm.make > @@ -11,19 +11,6 @@ > # > HOST_PACKAGES-$(PTXCONF_HOST_SOFTHSM) += host-softhsm > > -# > -# Paths and names > -# > -HOST_SOFTHSM_VERSION := 2.6.1 > -HOST_SOFTHSM_MD5 := 040b93ca327cbe0a3a8661e7c371ab16 > -HOST_SOFTHSM := softhsm-$(HOST_SOFTHSM_VERSION) > -HOST_SOFTHSM_SUFFIX := tar.gz > -HOST_SOFTHSM_URL := https://dist.opendnssec.org/source/$(HOST_SOFTHSM).$(HOST_SOFTHSM_SUFFIX) > -HOST_SOFTHSM_SOURCE := $(SRCDIR)/$(HOST_SOFTHSM).$(HOST_SOFTHSM_SUFFIX) > -HOST_SOFTHSM_DIR := $(HOST_BUILDDIR)/$(HOST_SOFTHSM) > -HOST_SOFTHSM_LICENSE := BSD-2-Clause > -HOST_SOFTHSM_LICENSE_FILES := file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210 > - > # ---------------------------------------------------------------------------- > # Prepare > # ---------------------------------------------------------------------------- > diff --git a/rules/softhsm.in b/rules/softhsm.in > new file mode 100644 > index 000000000000..180131580089 > --- /dev/null > +++ b/rules/softhsm.in > @@ -0,0 +1,20 @@ > +## SECTION=security > + > +config SOFTHSM > + tristate > + select OPENSSL > + select SQLITE > + default y if ALLYES > + prompt "SoftHSMv2 " > + help > + SoftHSM emulates an HSM (e.g. Hardware Security Module) device and > + provides the regular API to be work in conjunction with PKCS#11. > + https://www.opendnssec.org/download/ > + > +if SOFTHSM > + > +config SOFTHSM_P11_KIT > + bool > + default P11_KIT > + > +endif > diff --git a/rules/softhsm.make b/rules/softhsm.make > new file mode 100644 > index 000000000000..bc16dc6a5bee > --- /dev/null > +++ b/rules/softhsm.make > @@ -0,0 +1,76 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2018 by Juergen Borleis > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_SOFTHSM) += softhsm > + > +# > +# Paths and names > +# > +SOFTHSM_VERSION := 2.6.1 > +SOFTHSM_MD5 := 040b93ca327cbe0a3a8661e7c371ab16 > +SOFTHSM := softhsm-$(SOFTHSM_VERSION) > +SOFTHSM_SUFFIX := tar.gz > +SOFTHSM_URL := https://dist.opendnssec.org/source/$(SOFTHSM).$(SOFTHSM_SUFFIX) > +SOFTHSM_SOURCE := $(SRCDIR)/$(SOFTHSM).$(SOFTHSM_SUFFIX) > +SOFTHSM_DIR := $(BUILDDIR)/$(SOFTHSM) > +SOFTHSM_LICENSE := BSD-2-Clause > +SOFTHSM_LICENSE_FILES := file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210 > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +# > +# autoconf > +# > +SOFTHSM_CONF_TOOL := autoconf > +SOFTHSM_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > + --disable-non-paged-memory \ > + --disable-gost \ > + --with-crypto-backend=openssl \ > + --with-objectstore-backend-db \ > + --with-migrate \ > + --with-sqlite3=$(SYSROOT)/usr \ > + --$(call ptx/endis, PTXCONF_SOFTHSM_P11_KIT)-p11-kit \ > + --with-p11-kit=/usr/share/p11-kit/modules > + > +SOFTHSM_CPPFLAGS := \ > + -DDEBUG_LOG_STDERR=1 > + > +$(STATEDIR)/softhsm.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, softhsm) > + @$(call install_fixup, softhsm,PRIORITY,optional) > + @$(call install_fixup, softhsm,SECTION,base) > + @$(call install_fixup, softhsm,AUTHOR,"Rouven Czerwinski ") > + @$(call install_fixup, softhsm,DESCRIPTION,missing) > + > + @$(call install_copy, softhsm, 0, 0, 0755, -, /usr/bin/softhsm2-dump-db) > + @$(call install_copy, softhsm, 0, 0, 0755, -, /usr/bin/softhsm2-dump-file) > + @$(call install_copy, softhsm, 0, 0, 0755, -, /usr/bin/softhsm2-keyconv) > + @$(call install_copy, softhsm, 0, 0, 0755, -, /usr/bin/softhsm2-util) > + > + @$(call install_copy, softhsm, 0, 0, 0755, -, /usr/lib/softhsm/libsofthsm2.so) > + > + @$(call install_copy, softhsm, 0, 0, 0644, -, /etc/softhsm2.conf) > + > +ifdef PTXCONF_SOFTHSM_P11_KIT > + @$(call install_copy, softhsm, 0, 0, 0644, -, /usr/share/p11-kit/modules/softhsm2.module) > +endif > + > + @$(call install_finish, softhsm) > + > + @$(call touch) > + > +# vim: syntax=make > +# vim: syntax=make