From a615f0ef6260353b608c76f3d715428fbab1c8de Mon Sep 17 00:00:00 2001
From: =?utf8?q?PRAVEEN=20DORESWAMY=20NAIDU/System=20SW=20/SRI-Bangalore/St?=
 =?utf8?q?aff=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?=
 <praveen.dn@samsung.com>
Date: Fri, 10 Aug 2018 05:50:48 +0530
Subject: [PATCH] Specify setproxy option in build_rootfs (#2053)

Specify setproxy option with IP address value as argument instead of skipproxy option.
The ipaddress specified with be the actual proxy server.

example: ./build_rootfs.sh setproxy=<IP address of the proxy server>

Signed-off-by: Praveen D N <praveen.dn@samsung.com>
---
 tools/cross/build_rootfs.sh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tools/cross/build_rootfs.sh b/tools/cross/build_rootfs.sh
index f693525..11e5eff 100755
--- a/tools/cross/build_rootfs.sh
+++ b/tools/cross/build_rootfs.sh
@@ -3,12 +3,13 @@ set -x
 
 usage()
 {
-    echo "Usage: $0 [BuildArch] [LinuxCodeName] [--skipunmount] [--skipproxy]"
+    echo "Usage: $0 [BuildArch] [LinuxCodeName] [--setproxy=IP] [--skipunmount]"
     echo "BuildArch can be: arm(default), arm64 and armel"
     echo "LinuxCodeName - optional, Code name for Linux, can be: xenial(default), trusty"
     echo "                          If BuildArch is armel, this can be tizen(default)"
+    echo "--setproxy=IP - optional, IP is the proxy server IP address or url with portnumber"
+    echo "                           default no proxy. Example: --setproxy=127.1.2.3:8080"
     echo "--skipunmount - optional, will skip the unmount of rootfs folder."
-    echo "--skipproxy   - optional, will skip the adding proxy information for Seoul R&D Campus."
     exit 1
 }
 
@@ -20,8 +21,8 @@ __BuildArch=arm
 __UbuntuArch=armhf
 __LinuxCodeName=xenial
 __SkipUnmount=0
-__SkipProxy=0
-
+__IsProxySet=0
+__Apt=""
 # base development support
 __UbuntuPackages="build-essential"
 
@@ -72,12 +73,16 @@ for i in "$@" ; do
         xenial)
             __LinuxCodeName=xenial
             ;;
+        --setproxy*)
+            proxyip="${i#*=}"
+            __Apt="Acquire::http::proxy \"http://$proxyip/\";\n"
+            __Apt+="Acquire::https::proxy \"http://$proxyip/\";\n"
+            __Apt+="Acquire::ftp::proxy \"ftp://$proxyip/\";"
+            __IsProxySet=1
+            ;;
         --skipunmount)
             __SkipUnmount=1
             ;;
-        --skipproxy)
-            __SkipProxy=1
-            ;;
         *)
             __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i"
             ;;
@@ -97,9 +102,9 @@ if [ -d "$__RootfsDir" ]; then
     rm -rf $__RootfsDir
 fi
 
-if [ $__SkipProxy == 0 ] && [ "$__Tizen" != "tizen" ]; then
+if [ $__IsProxySet == 1 ] && [ "$__Tizen" != "tizen" ]; then
     mkdir -p $__RootfsDir/etc/apt/apt.conf.d
-    cp $__CrossDir/apt_proxy $__RootfsDir/etc/apt/apt.conf.d/90proxy
+    echo -e "$__Apt" >> $__RootfsDir/etc/apt/apt.conf.d/90proxy
 fi
 
 if [[ -n $__LinuxCodeName ]]; then
-- 
2.7.4