[libcamera-devel,1/5] Revert "libcamera: Make IPA module signing mandatory for the meantime"
diff mbox series

Message ID 20220807021456.9578-2-laurent.pinchart@ideasonboard.com
State Superseded
Headers show
Series
  • libcamera: Support openssl as an alternative to gnutls
Related show

Commit Message

Laurent Pinchart Aug. 7, 2022, 2:14 a.m. UTC 
Commit b382f67c833d ("libcamera: Make IPA module signing mandatory for
the meantime") made openssl and gnutls dependencies mandatory to work
around the lack of proper IPA module isolation support, which broke
operation without module signatures. Now that this has been fixed, we
can make the dependencies optional again.

This reverts commit b382f67c833de08717cfec19273b95f5819cab27.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 README.rst                | 2 +-
 src/libcamera/meson.build | 2 +-
 src/meson.build           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch
diff mbox series 

diff --git a/README.rst b/README.rst
index 77374c6a72b1..ffecd5bc6552 100644
--- a/README.rst
+++ b/README.rst
@@ -60,7 +60,7 @@  Meson Build system: [required]
 for the libcamera core: [required]
         libyaml-dev python3-yaml python3-ply python3-jinja2
 
-for IPA module signing: [required]
+for IPA module signing: [optional]
         libgnutls28-dev openssl
 
 for improved debugging: [optional]
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index b57bee7ef6ca..ff0e31ebcb63 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -65,7 +65,7 @@  subdir('pipeline')
 subdir('proxy')
 
 libdl = cc.find_library('dl')
-libgnutls = cc.find_library('gnutls', required : true)
+libgnutls = cc.find_library('gnutls', required : false)
 libudev = dependency('libudev', required : false)
 libyaml = dependency('yaml-0.1', required : false)
 
diff --git a/src/meson.build b/src/meson.build
index 34663a6f134d..65276fc74606 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -14,7 +14,7 @@  summary({
          }, section : 'Paths')
 
 # Module Signing
-openssl = find_program('openssl', required : true)
+openssl = find_program('openssl', required : false)
 if openssl.found()
     ipa_priv_key = custom_target('ipa-priv-key',
                                  output : ['ipa-priv-key.pem'],