Merge "apman: add support for ConmanDebug experiment."
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/google/google_gflags/google_gflags.mk b/package/google/google_gflags/google_gflags.mk
index 2d33290..ad2bf11 100644
--- a/package/google/google_gflags/google_gflags.mk
+++ b/package/google/google_gflags/google_gflags.mk
@@ -11,6 +11,7 @@
GOOGLE_GFLAGS_INSTALL_STAGING = YES
GOOGLE_GFLAGS_INSTALL_TARGET = YES
GOOGLE_GFLAGS_CONF_OPT = -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=ON
+HOST_GOOGLE_GFLAGS_CONF_OPT = -DGFLAGS_NAMESPACE=google -DBUILD_SHARED_LIBS=ON
$(eval $(call CMAKETARGETS))
$(eval $(call CMAKETARGETS,host))
diff --git a/package/google/google_glog/google_glog.mk b/package/google/google_glog/google_glog.mk
index feaf8da..812c634 100644
--- a/package/google/google_glog/google_glog.mk
+++ b/package/google/google_glog/google_glog.mk
@@ -1,9 +1,13 @@
-GOOGLE_GLOG_SITE = https://google-glog.googlecode.com/files/
-GOOGLE_GLOG_VERSION = 0.3.3
-GOOGLE_GLOG_SOURCE = glog-$(GOOGLE_GLOG_VERSION).tar.gz
+GOOGLE_GLOG_SITE = git://github.com/google/glog.git
+GOOGLE_GLOG_VERSION = v0.3.4
+GOOGLE_GLOG_DIR = $(BUILD_DIR)/google_glog-$(GOOGLE_LOG_VERSION)
GOOGLE_GLOG_INSTALL_STAGING = YES
GOOGLE_GLOG_INSTALL_TARGET = YES
+
GOOGLE_GLOG_DEPENDENCIES= google_gflags
+HOST_GOOGLE_GLOG_DEPENDENCIES= host-google_gflags
+
+GOOGLE_GLOG_CONF_OPT = --enable-static=no
$(eval $(call AUTOTARGETS))
$(eval $(call AUTOTARGETS,host))
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/qualcomm_switch/qualcomm_switch.mk b/package/qualcomm_switch/qualcomm_switch.mk
index 9db048b..1a45977 100644
--- a/package/qualcomm_switch/qualcomm_switch.mk
+++ b/package/qualcomm_switch/qualcomm_switch.mk
@@ -35,6 +35,10 @@
CFLAGS="$(TARGET_CFLAGS) -fPIC -DHSL_STANDALONG -I$(STAGING_DIR)/usr/include/python2.7 \
-I$(@D)/include -I$(LINUX_DIR)/include -L$(@D)/build/bin" \
$(HOST_DIR)/usr/bin/python setup.py build
+
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(TARGET_CFLAGS) -DHSL_STANDALONG -I$(@D)/include -I$(LINUX_DIR)/include -L$(@D)/build/bin" \
+ $(MAKE) -C $(@D)/google/qca83XXd
endef
define QUALCOMM_SWITCH_INSTALL_STAGING_CMDS
