diff --git a/config/kernel/linux-sun8i-default.config b/config/kernel/linux-sun8i-default.config index 52fb6f86e5..30147e462f 100644 --- a/config/kernel/linux-sun8i-default.config +++ b/config/kernel/linux-sun8i-default.config @@ -1047,7 +1047,8 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y -# CONFIG_BATMAN_ADV is not set +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set # CONFIG_OPENVSWITCH is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y diff --git a/config/kernel/linux-sunxi-next.config b/config/kernel/linux-sunxi-next.config index dbab7d26f3..2bd0307de5 100644 --- a/config/kernel/linux-sunxi-next.config +++ b/config/kernel/linux-sunxi-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.7.1 Kernel Configuration +# Linux/arm 4.7.2 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1252,7 +1252,13 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y CONFIG_DCB=y CONFIG_DNS_RESOLVER=y -# CONFIG_BATMAN_ADV is not set +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BATMAN_V=y +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +CONFIG_BATMAN_ADV_NC=y +CONFIG_BATMAN_ADV_MCAST=y +# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_VXLAN=m @@ -1623,6 +1629,7 @@ CONFIG_OF_MTD=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_OF_OVERLAY=y +CONFIG_OF_CONFIGFS=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PARPORT=m # CONFIG_PARPORT_PC is not set @@ -5180,7 +5187,7 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=m +CONFIG_CONFIGFS_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set diff --git a/general.sh b/general.sh index e789e8abe5..91b9a2b13d 100644 --- a/general.sh +++ b/general.sh @@ -232,7 +232,7 @@ fetch_from_repo() local local_hash=$(git rev-parse @ 2>/dev/null) case $ref_type in branch) - local remote_hash=$(git ls-remote -h $url "$ref_name" | cut -f1) + local remote_hash=$(git ls-remote -h $url "$ref_name" | head -1 | cut -f1) [[ -z $local_hash || $local_hash != $remote_hash ]] && changed=true ;;