libcamera: ipa: Remove IPAModuleInfo license field
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:
parent
eab143ee69
commit
ebd0cae455
6 changed files with 1 additions and 27 deletions
|
@ -18,7 +18,6 @@ struct IPAModuleInfo {
|
||||||
uint32_t pipelineVersion;
|
uint32_t pipelineVersion;
|
||||||
char pipelineName[256];
|
char pipelineName[256];
|
||||||
char name[256];
|
char name[256];
|
||||||
char license[64];
|
|
||||||
} __attribute__((packed));
|
} __attribute__((packed));
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
|
@ -275,7 +275,6 @@ const struct IPAModuleInfo ipaModuleInfo = {
|
||||||
1,
|
1,
|
||||||
"PipelineHandlerRkISP1",
|
"PipelineHandlerRkISP1",
|
||||||
"RkISP1 IPA",
|
"RkISP1 IPA",
|
||||||
"LGPL-2.1-or-later",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ipa_context *ipaCreate()
|
struct ipa_context *ipaCreate()
|
||||||
|
|
|
@ -7,8 +7,7 @@ mod = shared_module(ipa_name,
|
||||||
dependencies : libcamera_dep,
|
dependencies : libcamera_dep,
|
||||||
link_with : libipa,
|
link_with : libipa,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : ipa_install_dir,
|
install_dir : ipa_install_dir)
|
||||||
cpp_args : '-DLICENSE="LGPL-2.1-or-later"')
|
|
||||||
|
|
||||||
custom_target(ipa_name + '.so.sign',
|
custom_target(ipa_name + '.so.sign',
|
||||||
input : mod,
|
input : mod,
|
||||||
|
|
|
@ -127,7 +127,6 @@ const struct IPAModuleInfo ipaModuleInfo = {
|
||||||
0,
|
0,
|
||||||
"PipelineHandlerVimc",
|
"PipelineHandlerVimc",
|
||||||
"Dummy IPA for Vimc",
|
"Dummy IPA for Vimc",
|
||||||
LICENSE,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ipa_context *ipaCreate()
|
struct ipa_context *ipaCreate()
|
||||||
|
|
|
@ -216,27 +216,6 @@ Span<uint8_t> elfLoadSymbol(Span<uint8_t> elf, const char *symbol)
|
||||||
* \var IPAModuleInfo::name
|
* \var IPAModuleInfo::name
|
||||||
* \brief The name of the IPA module
|
* \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
|
* \todo Allow user to choose to isolate open source IPAs
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,6 @@ protected:
|
||||||
0,
|
0,
|
||||||
"PipelineHandlerVimc",
|
"PipelineHandlerVimc",
|
||||||
"Dummy IPA for Vimc",
|
"Dummy IPA for Vimc",
|
||||||
"GPL-2.0-or-later",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
count += runTest("src/ipa/vimc/ipa_vimc.so", testInfo);
|
count += runTest("src/ipa/vimc/ipa_vimc.so", testInfo);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue