From patchwork Mon Apr 13 13:30:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3444 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 84B8362E1F for ; Mon, 13 Apr 2020 15:31:08 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="XAYQUunW"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2078F24B for ; Mon, 13 Apr 2020 15:31:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1586784668; bh=VgmpQ5nVJZh70lhImecWaj6/sIBIpmiJZ+ma97RsmtM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=XAYQUunWYaSOOI6qll1GZmOeQbLRUyYGNIgLquSym5ORUyh269+UZ+YFT7SerSQip CTjxFLN/mxHLLiNhD++CV6TMd1YFdDhqXAI42XQ831/RSu3UxrEMqVfN0to9+UDw9Z hx/kF5H8RGVE667VmJJaCBSzSErisQYIuFwfjSY8= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 13 Apr 2020 16:30:47 +0300 Message-Id: <20200413133047.11913-12-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200413133047.11913-1-laurent.pinchart@ideasonboard.com> References: <20200413133047.11913-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 11/11] libcamera: ipa: Remove IPAModuleInfo license field X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2020 13:31:10 -0000 The IPAModuleInfo license field isn't needed anymore now that modules are cryptographically signed. Remove it. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- include/ipa/ipa_module_info.h | 1 - src/ipa/rkisp1/rkisp1.cpp | 1 - src/ipa/vimc/meson.build | 3 +-- src/ipa/vimc/vimc.cpp | 1 - src/libcamera/ipa_module.cpp | 21 --------------------- test/ipa/ipa_module_test.cpp | 1 - 6 files changed, 1 insertion(+), 27 deletions(-) diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h index 7ecd149566be..3b1c37d2a7f1 100644 --- a/include/ipa/ipa_module_info.h +++ b/include/ipa/ipa_module_info.h @@ -18,7 +18,6 @@ struct IPAModuleInfo { uint32_t pipelineVersion; char pipelineName[256]; char name[256]; - char license[64]; } __attribute__((packed)); extern "C" { diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 438b3c66f77a..ffa7191ba21e 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -273,7 +273,6 @@ const struct IPAModuleInfo ipaModuleInfo = { 1, "PipelineHandlerRkISP1", "RkISP1 IPA", - "LGPL-2.1-or-later", }; struct ipa_context *ipaCreate() diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build index 3097a12f964a..3c932aa7aaad 100644 --- a/src/ipa/vimc/meson.build +++ b/src/ipa/vimc/meson.build @@ -7,8 +7,7 @@ mod = shared_module(ipa_name, dependencies : libcamera_dep, link_with : libipa, install : true, - install_dir : ipa_install_dir, - cpp_args : '-DLICENSE="LGPL-2.1-or-later"') + install_dir : ipa_install_dir) custom_target(ipa_name + '.so.sign', input : mod, diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 6e2095b56bbc..b11d42c57696 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -107,7 +107,6 @@ const struct IPAModuleInfo ipaModuleInfo = { 0, "PipelineHandlerVimc", "Dummy IPA for Vimc", - LICENSE, }; struct ipa_context *ipaCreate() diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index 96b44f13192c..958ede74688e 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -216,27 +216,6 @@ Span elfLoadSymbol(Span elf, const char *symbol) * \var IPAModuleInfo::name * \brief The name of the IPA module * - * \var IPAModuleInfo::license - * \brief License of the IPA module - * - * This license is used to determine whether to force isolation of the IPA in - * a separate process. If the license is "Proprietary", then the IPA will - * be isolated. If the license is open-source, then the IPA will be allowed to - * run without isolation if the user enables it. The license should be an - * SPDX license string. The following licenses are currently available to - * allow the IPA to run unisolated: - * - * - GPL-2.0-only - * - GPL-2.0-or-later - * - GPL-3.0-only - * - GPL-3.0-or-later - * - LGPL-2.1-only - * - LGPL-2.1-or-later - * - LGPL-3.0-only - * - LGPL-3.0-or-later - * - * Any other license will cause the IPA to be run isolated. - * * \todo Allow user to choose to isolate open source IPAs */ diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp index 287e53fdaa8e..d22c302fa726 100644 --- a/test/ipa/ipa_module_test.cpp +++ b/test/ipa/ipa_module_test.cpp @@ -59,7 +59,6 @@ protected: 0, "PipelineHandlerVimc", "Dummy IPA for Vimc", - "GPL-2.0-or-later", }; count += runTest("src/ipa/vimc/ipa_vimc.so", testInfo);