Merge "gflt400: Use AVANTA_MC_RSFU from Marvell's SDK"
diff --git a/configs/gfrg240_defconfig b/configs/gfrg240_defconfig
index 894e9a9..7545977 100644
--- a/configs/gfrg240_defconfig
+++ b/configs/gfrg240_defconfig
@@ -10,7 +10,7 @@
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS="libc.so ld-uClibc libcrypt libresolv librt libpthread libdl libm libutil"
+BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS="libc.so ld-uClibc libcrypt libresolv librt libpthread libdl libm libutil libubacktrace"
BR2_TARGET_GENERIC_ISSUE="Welcome to Google Fiber"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
BR2_ROOTFS_DEVICE_TABLE="/dev/null"
@@ -22,7 +22,6 @@
BR2_PACKAGE_TOOLBOX=y
BR2_PACKAGE_TOYBOX=y
BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_MEMTESTER=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_PYTHON_SSL=y
BR2_PACKAGE_PYTHON_PYEXPAT=y
@@ -30,13 +29,11 @@
BR2_PACKAGE_PY_MONOTIME=y
BR2_PACKAGE_PYTHON_CRYPTO=y
BR2_PACKAGE_LIBNETFILTER_CONNTRACK=y
-BR2_PACKAGE_NCURSES=y
+BR2_PACKAGE_PROTOBUF_ONLY_LITE=y
BR2_PACKAGE_BRIDGE_UTILS=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_ETHTOOL=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IPUTILS=y
@@ -45,23 +42,19 @@
BR2_PACKAGE_NDISC6=y
BR2_PACKAGE_NDISC6_NDISC6=y
BR2_PACKAGE_NDISC6_RDISC6=y
-BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_VCONFIG=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
BR2_PACKAGE_DASH=y
-BR2_PACKAGE_ZSH=y
-BR2_PACKAGE_ZSH_BINARIES_ONLY=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
BR2_PACKAGE_SYSKLOGD=y
BR2_PACKAGE_UTIL_LINUX=y
-BR2_PACKAGE_UTIL_LINUX_AGETTY=y
-BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS=y
BR2_PACKAGE_GOOGLE_PLATFORM=y
BR2_PACKAGE_GOOGLE_PLATFORM_BASE=y
BR2_PACKAGE_GOOGLE_PLATFORM_HNVRAM=y
BR2_PACKAGE_GOOGLE_PLATFORM_WAVEGUIDE=y
BR2_PACKAGE_GOOGLE_PLATFORM_LOGUPLOAD=y
+BR2_PACKAGE_GOOGLE_TEST=y
BR2_PACKAGE_GOOGLE_NETWORK_BOX=y
BR2_PACKAGE_CATAWAMPUS=y
BR2_PACKAGE_HOSTAPD_QUANTENNA=y
diff --git a/fs/skeleton/bin/apman b/fs/skeleton/bin/apman
index 8466304..8780a94 100755
--- a/fs/skeleton/bin/apman
+++ b/fs/skeleton/bin/apman
@@ -13,6 +13,10 @@
initrwnd=
fi
+if experiment ConmanDebug; then
+ set -x
+fi
+
TMP_DIR="/tmp/conman"
CONFIG_DIR="/config/conman"
diff --git a/fs/skeleton/etc/init.d/network b/fs/skeleton/etc/init.d/network
index b36a2da..2b15d8e 100755
--- a/fs/skeleton/etc/init.d/network
+++ b/fs/skeleton/etc/init.d/network
@@ -229,14 +229,6 @@
for x in "$@"; do
[ -e "$x" ] || continue
- # Wait for MAC address.
- for i in $(seq 1 12); do
- if [ "$(get_mac_address_for_interface "$x")" != 00:00:00:00:00:00 ]; then
- break
- fi
- sleep 0.25
- done
-
local x="${x#/sys/class/net/}"
echo "Adding interface $x..."
diff --git a/package/bluez_utils/S54bluez b/package/bluez_utils/S54bluez
index c1df5b3..a520d81 100755
--- a/package/bluez_utils/S54bluez
+++ b/package/bluez_utils/S54bluez
@@ -85,7 +85,7 @@
fi
echo "$0: Starting btmon"
- babysit 30 btmon -A -t 2>&1 | logos btmon &
+ babysit 30 btmon -A -V -t 2>&1 | logos btmon &
sleep 1
echo "$0: Starting bluetoothd"
diff --git a/package/google/google_mcastcapture/Config.in b/package/google/google_mcastcapture/Config.in
index 479b59e..1f4f125 100644
--- a/package/google/google_mcastcapture/Config.in
+++ b/package/google/google_mcastcapture/Config.in
@@ -8,5 +8,7 @@
select BR2_PACKAGE_LIBEVENT
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_GOOGLE_GFLAGS
+ select BR2_PACKAGE_GOOGLE_GLOG
help
- Builds the mcastcapture sagesrv binary and libptsindex.so library
+ Builds the mcastcapture sagesrv binary, libptsindex.so library,
+ and dashsrv binary.
diff --git a/package/google/google_mcastcapture/google_mcastcapture.mk b/package/google/google_mcastcapture/google_mcastcapture.mk
index ceda945..3efc4a8 100644
--- a/package/google/google_mcastcapture/google_mcastcapture.mk
+++ b/package/google/google_mcastcapture/google_mcastcapture.mk
@@ -1,11 +1,12 @@
GOOGLE_MCASTCAPTURE_SITE=repo://vendor/google/mcastcapture
GOOGLE_MCASTCAPTURE_DEPENDENCIES=openssl libcurl protobuf zlib google_platform \
- google_libgep libevent libxml2 google_gflags libjson-cpp
-GOOGLE_MCASTCAPTURE_INSTALL_STAGING = YES
+ google_libgep libevent libxml2 google_gflags libjson-cpp \
+ google_glog
HOST_GOOGLE_MCASTCAPTURE_DEPENDENCIES += host-googletest host-openssl \
host-libcurl host-protobuf host-zlib host-google_platform \
host-libevent host-google_libgep host-libxml2 host-google_gflags \
- host-libjsoncpp
+ host-libjsoncpp host-google_glog
+GOOGLE_MCASTCAPTURE_INSTALL_STAGING = YES
define GOOGLE_MCASTCAPTURE_BUILD_CMDS
TARGET=$(TARGET_CROSS) \
diff --git a/package/google/google_platform/Config.in b/package/google/google_platform/Config.in
index 36da2eb..8a462d0 100644
--- a/package/google/google_platform/Config.in
+++ b/package/google/google_platform/Config.in
@@ -139,7 +139,6 @@
bool "Include Test Packages"
default n
depends on !(BR2_PACKAGE_GOOGLE_PROD && BR2_PACKAGE_GOOGLE_SPACECAST)
- select BR2_PACKAGE_BONNIE
select BR2_PACKAGE_CRASHME
select BR2_PACKAGE_DHRYSTONE
select BR2_PACKAGE_DROPBEAR
@@ -164,7 +163,6 @@
select BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
select BR2_PACKAGE_UTIL_LINUX_AGETTY
select BR2_PACKAGE_WHETSTONE
- select BR2_PACKAGE_SDPARM
select BR2_PACKAGE_SYSSTAT
select BR2_PACKAGE_TESTUSB
select BR2_PACKAGE_TRACEROUTE_NEW
@@ -228,8 +226,10 @@
select BR2_PACKAGE_GOOGLE_TVSTREAMPARSER
select BR2_PACKAGE_AVAHI
select BR2_PACKAGE_AVAHI_DAEMON
+ select BR2_PACKAGE_BONNIE
select BR2_PACKAGE_SAMBA
select BR2_PACKAGE_SAMBA_NMBLOOKUP
+ select BR2_PACKAGE_SDPARM
select BR2_PACKAGE_AVAHI_COMPAT_LIBDNS_SD
select BR2_PACKAGE_PROTOBUF
select BR2_PACKAGE_GOOGLE_FROBNICAST
diff --git a/support/scripts/postbuild.sh b/support/scripts/postbuild.sh
index 84cc09f..d0a8e94 100755
--- a/support/scripts/postbuild.sh
+++ b/support/scripts/postbuild.sh
@@ -32,8 +32,8 @@
exit 1;
fi
-version="${PLATFORM_PREFIX}$(support/scripts/version.sh)"
-echo -n "$version" >"$TARGET_DIR/etc/version" 2>/dev/null
+version=$(support/scripts/version.sh "$TARGET_DIR/..")
+echo -n "$PLATFORM_PREFIX$version" >"$TARGET_DIR/etc/version" 2>/dev/null
echo -n "fiberos" >"$TARGET_DIR/etc/os" 2>/dev/null
if [ "$PROD" != "y" ]; then
diff --git a/support/scripts/version.sh b/support/scripts/version.sh
index 582d638..a28e57e 100755
--- a/support/scripts/version.sh
+++ b/support/scripts/version.sh
@@ -2,6 +2,12 @@
# Returns current version being built, without leading platform string
# For ex. "-48-pre1-test-rel-739-gf1d6349"
+OUTPUT_DIR="$1"
+if [ -n "$OUTPUT_DIR" -a -r "$OUTPUT_DIR/force_version" ]; then
+ echo -n "-" && cat "$OUTPUT_DIR/force_version"
+ exit
+fi
+
if support/scripts/is-repo.sh; then
FORALL="repo forall -c"
elif support/scripts/is-git.sh; then
