NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: ipa: Remove IPAModuleInfo license field

Browse source 
The IPAModuleInfo license field isn't needed anymore now that modules
are cryptographically signed. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-03-29 07:22:47 +03:00
parent eab143ee69
commit ebd0cae455
6 changed files with 1 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/ipa/ipa_module_info.h
View file

@ -18,7 +18,6 @@ struct IPAModuleInfo {
uint32_t pipelineVersion;
char pipelineName[256];
char name[256];
char license[64];
} __attribute__((packed));
extern "C" {

1
src/ipa/rkisp1/rkisp1.cpp
View file

@ -275,7 +275,6 @@ const struct IPAModuleInfo ipaModuleInfo = {
1,
"PipelineHandlerRkISP1",
"RkISP1 IPA",
"LGPL-2.1-or-later",
};
struct ipa_context *ipaCreate()

3
src/ipa/vimc/meson.build
View file

@ -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,

1
src/ipa/vimc/vimc.cpp
View file

@ -127,7 +127,6 @@ const struct IPAModuleInfo ipaModuleInfo = {
0,
"PipelineHandlerVimc",
"Dummy IPA for Vimc",
LICENSE,
};
struct ipa_context *ipaCreate()

21
src/libcamera/ipa_module.cpp
View file

@ -216,27 +216,6 @@ Span<uint8_t> elfLoadSymbol(Span<uint8_t> 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
*/

1
test/ipa/ipa_module_test.cpp
View file

@ -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);