From: André Draszik <git@andred.net>
Date: Fri, 15 Jul 2016 15:03:27 +0000 (+0100)
Subject: oe-git-proxy: don't depend on syslinux
X-Git-Tag: uninative-1.3~265
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c91dbf3ca2faec95195c85b65aa6cab7de9bca2c;p=openembedded-core.git

oe-git-proxy: don't depend on syslinux

gethostip comes from syslinux. It seems odd to depend on a bootloader
to clone a git repository.

Switch to using getent from the c-library, which should be available
on every system.

We now also support the case where a hostname resolves to more than
one IP address.

Signed-off-by: André Draszik <git@andred.net>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy
index 1247902406..0078e95450 100755
--- a/scripts/oe-git-proxy
+++ b/scripts/oe-git-proxy
@@ -86,13 +86,14 @@ match_host() {
 
 	# Match by netmask
 	if valid_ipv4 $GLOB; then
-		HOST_IP=$(gethostip -d $HOST)
-		if valid_ipv4 $HOST_IP; then
-			match_ipv4 $GLOB $HOST_IP
-			if [ $? -eq 0 ]; then
-				return 0
+		for HOST_IP in $(getent ahostsv4 $HOST | grep ' STREAM ' | cut -d ' ' -f 1) ; do
+			if valid_ipv4 $HOST_IP; then
+				match_ipv4 $GLOB $HOST_IP
+				if [ $? -eq 0 ]; then
+					return 0
+				fi
 			fi
-		fi
+		done
 	fi
 
 	return 1