wpe: install root ca certificates on target filesystem

Metrological · Jun 23, 2015 · f25205b · f25205b
1 parent 930ec79
commit f25205b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/package/wpe/Config.in b/package/wpe/Config.in
@@ -22,7 +22,13 @@ config BR2_PACKAGE_WPE
 
 menu "Extra options"
 
-config BR2_WPE_GSTREAMER
+config BR2_PACKAGE_WPE_INSTALL_ROOTCA
+	bool "wpe-rootca"
+	default y
+	help
+	  Install Root CA's on filesystem
+
+config BR2_PACKAGE_WPE_USE_GSTREAMER
 	bool "wpe-gstreamer"
 	default y
 	depends on BR2_PACKAGE_GSTREAMER1
@@ -37,13 +43,13 @@ comment "wpe-gstreamer requires gstreamer 1.x"
 
 config BR2_PACKAGE_WPE_USE_ENCRYPTED_MEDIA
 	bool "encrypted-media"
-	depends on BR2_WPE_GSTREAMER
+	depends on BR2_PACKAGE_WPE_USE_GSTREAMER
 	depends on BR2_PACKAGE_GSTREAMER1_GIT
 	default n
 	help
 	  Enable Encrypted Media Extensions.
 comment "encrypted-media requires wpe-gstreamer"
-	depends on !BR2_WPE_GSTREAMER
+	depends on !BR2_PACKAGE_WPE_USE_GSTREAMER
 
 config BR2_PACKAGE_WPE_USE_DXDRM_EME
 	bool "dxdrm-eme"
@@ -58,11 +64,11 @@ comment "dxdrm-eme requires encrypted-media and dxdrm"
 config BR2_PACKAGE_WPE_USE_MEDIA_SOURCE
 	bool "media-source"
 	default n
-	depends on BR2_WPE_GSTREAMER
+	depends on BR2_PACKAGE_WPE_USE_GSTREAMER
 	help
 	  Enable Media Source Extensions API.
 comment "media-source requires wpe-gstreamer"
-	depends on !BR2_WPE_GSTREAMER
+	depends on !BR2_PACKAGE_WPE_USE_GSTREAMER
 
 config BR2_PACKAGE_WPE_USE_THREADED_COMPOSITOR
 	bool "threaded-compositor"

diff --git a/package/wpe/wpe.mk b/package/wpe/wpe.mk
@@ -95,7 +95,7 @@ WPE_FLAGS = \
 	-DUSE_SYSTEM_MALLOC=OFF \
 	-DUSE_KEY_INPUT_HANDLING_LINUX_INPUT=ON
 
-ifeq ($(BR2_WPE_GSTREAMER),y)
+ifeq ($(BR2_PACKAGE_WPE_USE_GSTREAMER),y)
 	WPE_DEPENDENCIES += \
 		gstreamer1 gst1-plugins-base gst1-plugins-good gst1-plugins-bad
 	WPE_FLAGS += \
@@ -176,6 +176,13 @@ define WPE_BUILD_CMDS
 	$(WPE_MAKE_ENV) $(HOST_DIR)/usr/bin/ninja -C $(WPE_BUILDDIR) $(WPE_NINJA_EXTRA_OPTIONS) libWPEWebKit.so libWPEWebInspectorResources.so WPE{Web,Network}Process WPE$(WPE_SHELL)Shell
 endef
 
+ifeq ($(BR2_PACKAGE_WPE_INSTALL_ROOTCA),y)
+define WPE_INSTALL_ROOTCA
+	mkdir -p $(TARGET_DIR)/etc/ssl/certs/
+	$(WGET) -O $(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt http://curl.haxx.se/ca/cacert.pem
+endef
+endif
+
 define WPE_INSTALL_STAGING_CMDS
 	(cd $(WPE_BUILDDIR) && \
 	cp bin/WPE{Network,Web}Process $(STAGING_DIR)/usr/bin/ && \
@@ -188,6 +195,7 @@ define WPE_INSTALL_TARGET_CMDS
 	cp -d lib/libWPE* $(TARGET_DIR)/usr/lib/ && \
 	$(STRIPCMD) $(TARGET_DIR)/usr/lib/libWPEWebKit.so.0.0.1 && \
 	popd > /dev/null)
+	$(WPE_INSTALL_ROOTCA)
 	$(WPE_INSTALL_AUTOSTART)
 endef