From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 16 Nov 2022 10:41:27 +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 1ovEv9-0098w0-Fj for lore@lore.pengutronix.de; Wed, 16 Nov 2022 10:41:27 +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 1ovEv8-0006rN-K7; Wed, 16 Nov 2022 10:41:26 +0100 Received: from lx20.hoststar.hosting ([168.119.41.54]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ovEub-0006qQ-DM for ptxdist@pengutronix.de; Wed, 16 Nov 2022 10:40:53 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=emfend.at; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Bri4FPEz8fnAUKTJCgaN0V0gHURvo5o6MXbYLqwbanI=; b=OeMRbzIlgJ2aKer+mFJTDZxHf5 A3n0LyVuz82vzUMMVsdrFEbVqNC5DnhYN7+5q8oVW9iGIU85qoCXEHXd4eqRRJTG0r4cQPkg1Q+2h rVGr3CNnS4IFbrY5gEG7bBcDHIYfKaYjrrbIMa4sLV8dnONgonmn8vViedbPfHuO7sxo=; Received: from 194-208-208-245.tele.net ([194.208.208.245]:59067 helo=localhost.localdomain) by lx20.hoststar.hosting with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1ovEuZ-0040hy-DO for ptxdist@pengutronix.de; Wed, 16 Nov 2022 10:40:51 +0100 From: Matthias Fend To: ptxdist@pengutronix.de Date: Wed, 16 Nov 2022 10:40:45 +0100 Message-Id: <20221116094045.202386-1-matthias.fend@emfend.at> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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 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 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 --- rules/libcamera.make | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/rules/libcamera.make b/rules/libcamera.make index 24b71ea7d..12969cafa 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)) -- 2.25.1