{"id":3444,"url":"https://patchwork.libcamera.org/api/patches/3444/?format=json","web_url":"https://patchwork.libcamera.org/patch/3444/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200413133047.11913-12-laurent.pinchart@ideasonboard.com>","date":"2020-04-13T13:30:47","name":"[libcamera-devel,v2,11/11] libcamera: ipa: Remove IPAModuleInfo license field","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"2b731f8fc80604fbdd355573dd9e877cd8b0056b","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3444/mbox/","series":[{"id":804,"url":"https://patchwork.libcamera.org/api/series/804/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=804","date":"2020-04-13T13:30:37","name":"Sign IPA modules instead of checking their advertised license","version":2,"mbox":"https://patchwork.libcamera.org/series/804/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3444/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3444/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 84B8362E1F\n\tfor ;\n\tMon, 13 Apr 2020 15:31:08 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2078F24B\n\tfor ;\n\tMon, 13 Apr 2020 15:31:08 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"XAYQUunW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1586784668;\n\tbh=VgmpQ5nVJZh70lhImecWaj6/sIBIpmiJZ+ma97RsmtM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=XAYQUunWYaSOOI6qll1GZmOeQbLRUyYGNIgLquSym5ORUyh269+UZ+YFT7SerSQip\n\tCTjxFLN/mxHLLiNhD++CV6TMd1YFdDhqXAI42XQ831/RSu3UxrEMqVfN0to9+UDw9Z\n\thx/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","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 11/11] libcamera: ipa: Remove\n\tIPAModuleInfo license field","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 13 Apr 2020 13:31:10 -0000"},"content":"The IPAModuleInfo license field isn't needed anymore now that modules\nare cryptographically signed. Remove it.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \n---\n include/ipa/ipa_module_info.h | 1 -\n src/ipa/rkisp1/rkisp1.cpp | 1 -\n src/ipa/vimc/meson.build | 3 +--\n src/ipa/vimc/vimc.cpp | 1 -\n src/libcamera/ipa_module.cpp | 21 ---------------------\n test/ipa/ipa_module_test.cpp | 1 -\n 6 files changed, 1 insertion(+), 27 deletions(-)","diff":"diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h\nindex 7ecd149566be..3b1c37d2a7f1 100644\n--- a/include/ipa/ipa_module_info.h\n+++ b/include/ipa/ipa_module_info.h\n@@ -18,7 +18,6 @@ struct IPAModuleInfo {\n \tuint32_t pipelineVersion;\n \tchar pipelineName[256];\n \tchar name[256];\n-\tchar license[64];\n } __attribute__((packed));\n \n extern \"C\" {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 438b3c66f77a..ffa7191ba21e 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -273,7 +273,6 @@ const struct IPAModuleInfo ipaModuleInfo = {\n \t1,\n \t\"PipelineHandlerRkISP1\",\n \t\"RkISP1 IPA\",\n-\t\"LGPL-2.1-or-later\",\n };\n \n struct ipa_context *ipaCreate()\ndiff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build\nindex 3097a12f964a..3c932aa7aaad 100644\n--- a/src/ipa/vimc/meson.build\n+++ b/src/ipa/vimc/meson.build\n@@ -7,8 +7,7 @@ mod = shared_module(ipa_name,\n dependencies : libcamera_dep,\n link_with : libipa,\n install : true,\n- install_dir : ipa_install_dir,\n- cpp_args : '-DLICENSE=\"LGPL-2.1-or-later\"')\n+ install_dir : ipa_install_dir)\n \n custom_target(ipa_name + '.so.sign',\n input : mod,\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex 6e2095b56bbc..b11d42c57696 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -107,7 +107,6 @@ const struct IPAModuleInfo ipaModuleInfo = {\n \t0,\n \t\"PipelineHandlerVimc\",\n \t\"Dummy IPA for Vimc\",\n-\tLICENSE,\n };\n \n struct ipa_context *ipaCreate()\ndiff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp\nindex 96b44f13192c..958ede74688e 100644\n--- a/src/libcamera/ipa_module.cpp\n+++ b/src/libcamera/ipa_module.cpp\n@@ -216,27 +216,6 @@ Span elfLoadSymbol(Span elf, const char *symbol)\n * \\var IPAModuleInfo::name\n * \\brief The name of the IPA module\n *\n- * \\var IPAModuleInfo::license\n- * \\brief License of the IPA module\n- *\n- * This license is used to determine whether to force isolation of the IPA in\n- * a separate process. If the license is \"Proprietary\", then the IPA will\n- * be isolated. If the license is open-source, then the IPA will be allowed to\n- * run without isolation if the user enables it. The license should be an\n- * SPDX license string. The following licenses are currently available to\n- * allow the IPA to run unisolated:\n- *\n- * - GPL-2.0-only\n- * - GPL-2.0-or-later\n- * - GPL-3.0-only\n- * - GPL-3.0-or-later\n- * - LGPL-2.1-only\n- * - LGPL-2.1-or-later\n- * - LGPL-3.0-only\n- * - LGPL-3.0-or-later\n- *\n- * Any other license will cause the IPA to be run isolated.\n- *\n * \\todo Allow user to choose to isolate open source IPAs\n */\n \ndiff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp\nindex 287e53fdaa8e..d22c302fa726 100644\n--- a/test/ipa/ipa_module_test.cpp\n+++ b/test/ipa/ipa_module_test.cpp\n@@ -59,7 +59,6 @@ protected:\n \t\t\t0,\n \t\t\t\"PipelineHandlerVimc\",\n \t\t\t\"Dummy IPA for Vimc\",\n-\t\t\t\"GPL-2.0-or-later\",\n \t\t};\n \n \t\tcount += runTest(\"src/ipa/vimc/ipa_vimc.so\", testInfo);\n","prefixes":["libcamera-devel","v2","11/11"]}