From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 29 Aug 2025 11:47:40 +0200 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 1urvht-005m2o-1W for lore@lore.pengutronix.de; Fri, 29 Aug 2025 11:47:40 +0200 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 1urvhs-0006s2-LV; Fri, 29 Aug 2025 11:47:40 +0200 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 1urvgc-0003xa-Uu; Fri, 29 Aug 2025 11:46:22 +0200 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 1urvgc-002hs8-2W; Fri, 29 Aug 2025 11:46:22 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1urvgc-0000000AzVq-34R1; Fri, 29 Aug 2025 11:46:22 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 29 Aug 2025 11:46:22 +0200 Message-ID: <20250829094622.2619727-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250814100011.1962990-1-f.pflug@pengutronix.de> References: <20250814100011.1962990-1-f.pflug@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] softhsm: use alternative for config file 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: Fabian Pflug 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 5af1db972fd3fd13b45f4d860a285c87ef564a4e. Michael [sent from post-receive hook] On Fri, 29 Aug 2025 11:46:22 +0200, Fabian Pflug wrote: > The config file for softhsm is better as install-alternative, as it > might be overwritten by the different boards. > > Signed-off-by: Fabian Pflug > Message-Id: <20250814100011.1962990-1-f.pflug@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/softhsm.make b/rules/softhsm.make > index 80f79adec11d..a69a2c585e81 100644 > --- a/rules/softhsm.make > +++ b/rules/softhsm.make > @@ -62,7 +62,7 @@ $(STATEDIR)/softhsm.targetinstall: > > @$(call install_copy, softhsm, 0, 0, 0755, -, /usr/lib/softhsm/libsofthsm2.so) > > - @$(call install_copy, softhsm, 0, 0, 0644, -, /etc/softhsm2.conf) > + @$(call install_alternative, 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)