Merge "ipapply: Disable for an hour when /tmp/ipapply_disabled exists."
diff --git a/configs/gflt400_defconfig b/configs/gflt400_defconfig
new file mode 100644
index 0000000..855ad18
--- /dev/null
+++ b/configs/gflt400_defconfig
@@ -0,0 +1,94 @@
+BR2_arm=y
+BR2_arm926t=y
+BR2_GCC_TARGET_TUNE="marvell-f"
+BR2_DL_DIR="${TOPDIR}/../vendor/opensource/tarballs"
+BR2_JLEVEL=15
+BR2_CCACHE=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_PATH="${TOPDIR}/../toolchains/prism"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-marvell-linux-uclibcgnueabi"
+BR2_TOOLCHAIN_EXTERNAL_LARGEFILE=y
+BR2_TOOLCHAIN_EXTERNAL_INET_IPV6=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
+BR2_TOOLCHAIN_EXTERNAL_WCHAR=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TARGET_GENERIC_HOSTNAME="gfiberjack"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Google Fiber"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
+BR2_ROOTFS_DEVICE_TABLE="/dev/null"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="${TOPDIR}/support/scripts/postbuild.sh"
+BR2_TARGET_GENERIC_PLATFORM_NAME="gflt400"
+BR2_TARGET_GENERIC_PLATFORMS_SUPPORTED="GFLT400"
+# BR2_PACKAGE_BUSYBOX is not set
+BR2_PACKAGE_TOOLBOX=y
+BR2_PACKAGE_TOYBOX=y
+BR2_PACKAGE_GREP=y
+BR2_PACKAGE_DEVMEM2=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_MTD=y
+# BR2_PACKAGE_MTD_UBIATTACH is not set
+# BR2_PACKAGE_MTD_UBICRC32 is not set
+# BR2_PACKAGE_MTD_UBIDETACH is not set
+# BR2_PACKAGE_MTD_UBIFORMAT is not set
+# BR2_PACKAGE_MTD_UBIMKVOL is not set
+# BR2_PACKAGE_MTD_UBINFO is not set
+# BR2_PACKAGE_MTD_UBINIZE is not set
+# BR2_PACKAGE_MTD_UBIRENAME is not set
+# BR2_PACKAGE_MTD_UBIRMVOL is not set
+# BR2_PACKAGE_MTD_UBIRSVOL is not set
+# BR2_PACKAGE_MTD_UBIUPDATEVOL is not set
+# BR2_PACKAGE_MTD_UBISCRUBBER is not set
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_PYTHON_SSL=y
+BR2_PACKAGE_PYTHON_PYEXPAT=y
+BR2_PACKAGE_PY_DNS=y
+BR2_PACKAGE_PY_MONOTIME=y
+BR2_PACKAGE_PYTHON_CRYPTO=y
+BR2_PACKAGE_SQLITE=y
+BR2_PACKAGE_PROTOBUF_VERSION_VALUE="2.6.1"
+BR2_PACKAGE_DHCP=y
+BR2_PACKAGE_DHCP_CLIENT=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPUTILS=y
+BR2_PACKAGE_NDISC6=y
+BR2_PACKAGE_NDISC6_NDISC6=y
+BR2_PACKAGE_NDISC6_RDISC6=y
+BR2_PACKAGE_NETKITTELNET=y
+BR2_PACKAGE_DASH=y
+BR2_PACKAGE_ZSH=y
+BR2_PACKAGE_ZSH_BINARIES_ONLY=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_NANO=y
+BR2_PACKAGE_GOOGLE_PLATFORM=y
+BR2_PACKAGE_GOOGLE_PLATFORM_BASE=y
+BR2_PACKAGE_GOOGLE_PLATFORM_HNVRAM=y
+BR2_PACKAGE_GOOGLE_PLATFORM_LOGUPLOAD=y
+BR2_PACKAGE_GOOGLE_PLATFORM_SYSMGR=y
+BR2_PACKAGE_GOOGLE_PLATFORM_LEDPATTERN=y
+BR2_PACKAGE_GOOGLE_FIBER_JACK=y
+BR2_PACKAGE_GOOGLE_PRISM=y
+BR2_PACKAGE_CATAWAMPUS=y
+BR2_PACKAGE_MV_APP_PON_TYPE="GPON"
+BR2_PACKAGE_MV_APP=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_TARGET_ROOTFS_GINSTALL=y
+BR2_TARGET_ROOTFS_GINSTALL_LOADER_DIR="../loader-bin/marvell"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="gflt400"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="repo://uboot/prism"
+BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="HEAD"
+BR2_TARGET_UBOOT_FORMAT_SPI_BIN=y
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="repo://kernel/prism"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="HEAD"
+BR2_LINUX_KERNEL_DEFCONFIG="gflt400"
+BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/fs/skeleton/bin/wifi.test.platform_gfibertv b/fs/skeleton/bin/wifi.test.platform_gfibertv
index d4352b7..b7fa368 100755
--- a/fs/skeleton/bin/wifi.test.platform_gfibertv
+++ b/fs/skeleton/bin/wifi.test.platform_gfibertv
@@ -28,7 +28,7 @@
WVPASS wifi restore
WVFAIL hostapd_running
-rm -f /tmp/*.wlan[0-9] /tmp/*.wlan[0-9] /tmp/*.wcli[0-9] /tmp/*.opts.2.4 /tmp/*.opts.5
+rm -f /tmp/*.wlan* /tmp/*.wcli* /tmp/*.opts.2.4 /tmp/*.opts.5
WVPASS wifi set -b2.4 -e NONE
WVPASS hostapd_running
diff --git a/package/bcm_common/bcm_common.mk b/package/bcm_common/bcm_common.mk
index eb4e02a..c7108fa 100644
--- a/package/bcm_common/bcm_common.mk
+++ b/package/bcm_common/bcm_common.mk
@@ -69,7 +69,8 @@
URSR_TOP=${BCM_NEXUS_DIR}/.. \
COMMON_DRM_TOP=${BCM_BSEAV_DIR}/lib/security/common_drm \
SAGE_SUPPORT=${GOOG_SAGE_SUPPORT} \
-SAGE_SECURE_MODE=6
+SAGE_SECURE_MODE=6 \
+WITH_DEFRAG=1
ifeq ($(findstring $(PLAT_NOQUOTES), 97425 97428), $(PLAT_NOQUOTES))
BCM_MAKE_ENV += WVCDM_VERSION=2.1
diff --git a/package/bcm_rockford/bcm_rockford.mk b/package/bcm_rockford/bcm_rockford.mk
index fa0454a..d7c6601 100644
--- a/package/bcm_rockford/bcm_rockford.mk
+++ b/package/bcm_rockford/bcm_rockford.mk
@@ -48,7 +48,7 @@
endif
define BCM_ROCKFORD_BUILD_CMDS
- $(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y WITH_DEFRAG=1 $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/middleware/v3d/driver -f V3DDriver.mk
+ $(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/middleware/v3d/driver -f V3DDriver.mk
$(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/middleware/v3d/platform/nexus -f platform_nexus.mk
$(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y NEXUS_MODE=client $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/applications/khronos/v3d/nexus/cube
$(BCM_MAKE_ENV) $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/lib/psip
diff --git a/package/ifplugd/ifplugd.action b/package/ifplugd/ifplugd.action
index 60a9aeb..d3eae86 100755
--- a/package/ifplugd/ifplugd.action
+++ b/package/ifplugd/ifplugd.action
@@ -9,6 +9,8 @@
CONMAN_STATUS_DIR=/tmp/conman/interfaces
+echo "ifplugd: $iface is $action"
+
case "$action" in
up)
# Clear any existing dynamic IP config.
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index e928206..4e781ac 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -11,7 +11,8 @@
TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 cross_compiling=y td_cv_buggygetaddrinfo=cross
TCPDUMP_CONF_OPT = --without-crypto \
- $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
+ --enable-ipv6 \
+ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
TCPDUMP_DEPENDENCIES = zlib libpcap
