From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 22 Nov 2022 14:20:31 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oxTCR-00FSSb-Kx for lore@lore.pengutronix.de; Tue, 22 Nov 2022 14:20:31 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oxTCR-00076L-2V; Tue, 22 Nov 2022 14:20:31 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oxTC5-0006s6-S3; Tue, 22 Nov 2022 14:20:09 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oxTC4-005rVj-B6; Tue, 22 Nov 2022 14:20:09 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oxTC4-00DFkz-L1; Tue, 22 Nov 2022 14:20:08 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 22 Nov 2022 14:20:08 +0100 Message-Id: <20221122132008.3158790-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221116094045.202386-1-matthias.fend@emfend.at> References: <20221116094045.202386-1-matthias.fend@emfend.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] libcamera: install IPA proxy workers unconditionally 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: Matthias Fend 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.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 4a10c229b7aab6e846270c97678680acbb12fbe7. Michael [sent from post-receive hook] On Tue, 22 Nov 2022 14:20:08 +0100, Matthias Fend wrote: > If an IPA module is unsigned or the signature is invalid, the IPA is > isolated and runs in a separate process. > These so-called proxy workers must be installed for each activated > pipeline, even if the corresponding IPA module is not selected. Otherwise, > an out-of-tree IPA module (these are unsigned) cannot be used. > Since there is not an IPA module or associated proxy for every pipeline > (e.g. simple, uvcvideo), an additional list is required. > > Signed-off-by: Matthias Fend > Message-Id: <20221116094045.202386-1-matthias.fend@emfend.at> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcamera.make b/rules/libcamera.make > index 24b71ea7db73..12969cafa57d 100644 > --- a/rules/libcamera.make > +++ b/rules/libcamera.make > @@ -60,6 +60,12 @@ LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_SIMPLE) += simple > LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo > LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_VIMC) += vimc > > +LIBCAMERA_IPA_PROXIES-y := > +LIBCAMERA_IPA_PROXIES-$(PTXCONF_LIBCAMERA_PIPELINE_IPU3) += ipu3 > +LIBCAMERA_IPA_PROXIES-$(PTXCONF_LIBCAMERA_PIPELINE_RASPBERRYPI) += raspberrypi > +LIBCAMERA_IPA_PROXIES-$(PTXCONF_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 > +LIBCAMERA_IPA_PROXIES-$(PTXCONF_LIBCAMERA_PIPELINE_VIMC) += vimc > + > LIBCAMERA_CONF_TOOL := meson > LIBCAMERA_CONF_OPT := \ > $(CROSS_MESON_USR) \ > @@ -80,9 +86,12 @@ LIBCAMERA_CONF_OPT := \ > # Target-Install > # ---------------------------------------------------------------------------- > > -define install_ipa > +define install_ipa_proxy > @$(call install_copy, libcamera, 0, 0, 0755, -, \ > /usr/libexec/libcamera/$(strip $(1))_ipa_proxy) > +endef > + > +define install_ipa > @$(call install_alternative_tree, libcamera, 0, 0, \ > /usr/share/libcamera/ipa/$(strip $(1))) > endef > @@ -113,6 +122,9 @@ $(STATEDIR)/libcamera.targetinstall: > @$(call install_lib, libcamera, 0, 0, 0644, libcamera) > @$(call install_lib, libcamera, 0, 0, 0644, libcamera-base) > > + @$(foreach proxy,$(LIBCAMERA_IPA_PROXIES-y), \ > + $(call install_ipa_proxy, $(proxy))$(ptx/nl)) > + > @$(foreach ipa,$(LIBCAMERA_IPASC-y), \ > $(call install_ipa, $(ipa))$(ptx/nl)) >