Merge with master

Author: modeveci

README.md

@@ -25,7 +25,9 @@ Select a configuration for your embedded device from the `configs/` directory. F
 ```
 make raspberrypi2_wpe_defconfig
 ```
-Buildroot provides you a menuconfig option for the first time. Select additional packages if you require or exit and save the config. 
+Buildroot provides you a menuconfig option for the first time. Select additional packages if you require or exit and save the config.
+
+**Note** that the `_ml` (Metrological) configurations such as `raspberrypi2_wpe_ml_defconfig` should be considered for internal Metrological use only. Unless you have access to the private repositories required, the build will fail.
 
 ### Build
 To build:

board/homecast/homecast.sh

@@ -34,10 +34,11 @@ rsync -ar --files-from="${ROOTFS_FILES}" "${TARGET_DIR}" "${ROOTFS_DIR}"
 mkdir -p "${ROOTFS_DIR}/usr/share/fonts/ttf-bitstream-vera"
 cp -f "${TARGET_DIR}/usr/share/fonts/ttf-bitstream-vera/Vera.ttf" "${ROOTFS_DIR}/usr/share/fonts/ttf-bitstream-vera/"
 
-# WebBridge startup script
-mkdir -p "${ROOTFS_DIR}/homecast"
-cp -pf "${BOARD_DIR}/homecast/webbridge" "${ROOTFS_DIR}/homecast"
-#cp -pf "${BOARD_DIR}/homecast/webbridge-stub" "${ROOTFS_DIR}/homecast"
+# move utility lib of brcm plugin to usr/lib
+mv "${ROOTFS_DIR}/usr/lib/gstreamer-1.0/libbrcmgstutil.so" "${ROOTFS_DIR}/usr/lib/"
+
+# WPEFramework launcher
+cp -pf "${BOARD_DIR}/homecast/wpeframework.sh" "${ROOTFS_DIR}"
 
 # WebServer path
 mkdir -p "${ROOTFS_DIR}/www"

board/homecast/homecast.txt

@@ -1,6 +1,6 @@
 WPENetworkProcess
 WPEWebProcess
-WPEDatabaseProcess
+WPEStorageProcess
 WPEFramework
 WPEProcess
 gst-plugin-scanner
@@ -13,6 +13,7 @@ libcairo.so
 libcares.so
 libcrypto.so
 libcurl.so
+libepoxy.so
 libevdev.so
 libexpat.so
 libfaad.so
@@ -61,6 +62,7 @@ libnettle.so
 liborc-0.4.so
 liborc-test-0.4.so
 libpcre.so
+libunistring.so
 libpixman-1.so
 libplayready.so
 libpng16.so
@@ -108,8 +110,18 @@ libWPEFrameworkTracing.so
 libWPEFrameworkVirtualInput.so
 libWPEFrameworkTimeSync.so
 libWPEFrameworkWebShell.so
+libWPEFrameworkSwitchBoard.so
+libWPEFrameworkProvisioning.so
+libWPEFrameworkNetflix.so
 libnxclient.so
 libWPEBackend.so
 libWPEBackend-rdk.so
 libWPEBackend-default.so
 libwebpdemux.so
+libbrcmgstutil.so
+libbrcmaudiodecoder.so
+libbrcmaudiofilter.so
+libbrcmaudiosink.so
+libbrcmvideodecoder.so
+libbrcmvideosink.so
+libbrcmvidfilter.so

board/homecast/homecast/metrological.sh

@@ -0,0 +1,51 @@
+#!/bin/sh
+export SOURCE=/tmp/nfs/metrological
+export DESTINATION=/tmp/nfs/cwc
+export LD_LIBRARY_PATH=$SOURCE/usr/lib:/lib:/usr/lib:$SOURCE/lib
+export PATH=$PATH:$SOURCE/usr/bin
+
+export GST_PLUGIN_SCANNER=$SOURCE/usr/libexec/gstreamer-1.0/gst-plugin-scanner
+export GST_PLUGIN_SYSTEM_PATH=$SOURCE/usr/lib/gstreamer-1.0
+
+# Currently the root system is read-only. Since we cannot add anything there we bind 
+# existing directories with a copy of the actual system. All the stuff we want to 
+# add is symbolicly linked in from our sources..
+if [ ! -d $DESTINATION ]; then
+
+mkdir -p $DESTINATION/share
+mkdir -p $DESTINATION/etc
+mkdir -p $DESTINATION/lib
+cp -rfap /usr/share/* $DESTINATION/share
+cp -rfap /etc/* $DESTINATION/etc
+cp -rfap /usr/lib/* $DESTINATION/lib
+
+ln -s $SOURCE/usr/share/mime $DESTINATION/share/mime
+ln -s $SOURCE/usr/share/X11 $DESTINATION/share/X11
+ln -s $SOURCE/usr/share/WPEFramework $DESTINATION/share/WPEFramework
+ln -s $SOURCE/usr/share/fonts $DESTINATION/share/fonts
+ln -s $SOURCE/etc/ssl $DESTINATION/etc/ssl
+ln -s $SOURCE/etc/ssl $DESTINATION/lib/ssl
+ln -s $SOURCE/etc/fonts $DESTINATION/etc/fonts
+ln -s $SOURCE/etc/WPEFramework $DESTINATION/etc/WPEFramework
+ln -s $SOURCE/usr/lib/gio $DESTINATION/lib/gio
+ln -s /lib/libv3ddriver.so $SOURCE/usr/lib/libEGL.so 
+ln -s /lib/libv3ddriver.so $SOURCE/usr/lib/libGLESv2.so 
+fi
+
+grep -q "/usr/share" /proc/mounts && echo "/usr/share is already mounted" || mount --bind $DESTINATION/share/ /usr/share/
+grep -q "/etc" /proc/mounts && echo "/etc is already mounted" || mount --bind $DESTINATION/etc/ /etc/
+grep -q "/usr/lib" /proc/mounts && echo "/usr/lib is already mounted" || mount --bind $DESTINATION/lib/ /usr/lib/
+
+cp -rfap $SOURCE/etc/playready/* /etc/playready/
+ln -s $SOURCE/etc/ssl /etc/ssl
+
+if [ ! -d $SOURCE/persistent/Netflix ]; then 
+	mkdir -p $SOURCE/persistent/Netflix/dpi
+	ln -sfn /etc/playready $SOURCE/persistent/Netflix/dpi/playready
+fi
+
+# Firewall for non-prod builds
+iptables -I INPUT -i eth0 -p tcp --dport 80 -m state --state NEW,ESTABLISHED -j ACCEPT
+
+LD_PRELOAD=$SOURCE/lib/libstdc\+\+.so.6.0.21:/lib/libnexus.so WPEFramework -c $SOURCE/etc/WPEFramework/config.json
+

board/homecast/homecast/webbridge

@@ -27,7 +27,7 @@ avoid_warnings=1
 
 gpu_mem_256=128
 gpu_mem_512=196
-gpu_mem_1024=256
+gpu_mem_1024=384
 
 ################################################################################
 #

board/homecast/homecast/webbridge-stub

@@ -53,7 +53,7 @@
                             ip = deviceInfo.Addresses.IpAddress;
                         else {
                             for (var i in deviceInfo.addresses) {
-                                if (deviceInfo.addresses[i].ip && deviceInfo.addresses[i].ip !== '127.0.0.1') {
+                                if (Array.isArray(deviceInfo.addresses[i].ip) && deviceInfo.addresses[i].ip[0] !== '127.0.0.1') {
                                     ip = deviceInfo.addresses[i].ip;
                                     break;
                                 }

board/homecast/homecast/wpeframework.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -u
 set -e