Merge branch 'master' of https://github.com/igorpecovnik/lib

config/boards/beelinkx2.conf

@@ -15,4 +15,3 @@ HARDWARE="https://linux-sunxi.org/Beelink_X2"
 CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/"
 FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3"
 MAINLINE="hide"
-INCLUDE1="Remarks|docs/boards/beelinkx2.md"

config/kernel/linux-odroidc2-default.config

@@ -242,7 +242,7 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_CFQ_GROUP_IOSCHED=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
@@ -1691,7 +1691,7 @@ CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 # CONFIG_MACVTAP is not set
-# CONFIG_VXLAN is not set
+CONFIG_VXLAN=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
@@ -3408,7 +3408,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_MON is not set
+CONFIG_USB_MON=m
 # CONFIG_USB_WUSB_CBAF is not set
 
 #

general.sh

@@ -197,9 +197,11 @@ fetch_from_repo()
 	cd $SOURCES/$workdir
 
 	# check if existing remote URL for the repo or branch does not match current one
-	if [[ $(git rev-parse --is-inside-work-tree 2>/dev/null) == true && \
+	# may not be supported by older git versions
+	local current_url=$(git remote get-url origin 2>/dev/null)
+	if [[ -n $current_url && $(git rev-parse --is-inside-work-tree 2>/dev/null) == true && \
 				$(git rev-parse --show-toplevel) == $(pwd) && \
-				$(git remote get-url origin) != $url ]]; then
+				$current_url != $url ]]; then
 		display_alert "Remote URL does not match, removing existing local copy"
 		rm -rf .git *
 	fi