From 5d1366f3240b2e78d3f3804a6b8dfc6ba8bf7b1c Mon Sep 17 00:00:00 2001
From: SaeHie Park <saehie.park@samsung.com>
Date: Tue, 27 Feb 2018 17:11:32 +0900
Subject: [PATCH] Correct ubuntu release

This will add trusty and remove wily, zesty as we work on 14.04:trusty and 16.04:xenial
---
 README.md                           |  2 +-
 tools/cross/arm/sources.list.trusty | 11 +++++++++++
 tools/cross/arm/sources.list.wily   | 11 -----------
 tools/cross/arm/sources.list.zesty  | 11 -----------
 tools/cross/build_rootfs.sh         |  9 +++------
 5 files changed, 15 insertions(+), 29 deletions(-)
 create mode 100644 tools/cross/arm/sources.list.trusty
 delete mode 100644 tools/cross/arm/sources.list.wily
 delete mode 100644 tools/cross/arm/sources.list.zesty

diff --git a/README.md b/README.md
index a2aed2a..0e838fe 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Use `build_rootfs.sh` script to prepare Root File System. You should have `sudo`
 sudo ./tools/cross/build_rootfs.sh arm
 ```
 - only supports `arm` architecutre for now
-- supports `xenial`(default), `wily`, and `zesty` release
+- supports `xenial`(default) and `trusty` release
 
 To see the options,
 ```
diff --git a/tools/cross/arm/sources.list.trusty b/tools/cross/arm/sources.list.trusty
new file mode 100644
index 0000000..8aa98a2
--- /dev/null
+++ b/tools/cross/arm/sources.list.trusty
@@ -0,0 +1,11 @@
+deb http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty main restricted universe
+
+deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
+deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main restricted universe
+
+deb http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
+deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-backports main restricted
+
+deb http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports/ trusty-security main restricted universe multiverse
diff --git a/tools/cross/arm/sources.list.wily b/tools/cross/arm/sources.list.wily
deleted file mode 100644
index a67b1c4..0000000
--- a/tools/cross/arm/sources.list.wily
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ wily main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ wily-security main restricted universe multiverse
diff --git a/tools/cross/arm/sources.list.zesty b/tools/cross/arm/sources.list.zesty
deleted file mode 100644
index ea2c14a..0000000
--- a/tools/cross/arm/sources.list.zesty
+++ /dev/null
@@ -1,11 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted
-
-deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse
diff --git a/tools/cross/build_rootfs.sh b/tools/cross/build_rootfs.sh
index d53a110..e4671a9 100755
--- a/tools/cross/build_rootfs.sh
+++ b/tools/cross/build_rootfs.sh
@@ -4,7 +4,7 @@ usage()
 {
     echo "Usage: $0 [BuildArch] [LinuxCodeName] [--skipunmount] [--skipproxy]"
     echo "BuildArch can be: arm"
-    echo "LinuxCodeName - optional, Code name for Linux, can be: xenial(default), wily, zesty"
+    echo "LinuxCodeName - optional, Code name for Linux, can be: xenial(default), trusty"
     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
@@ -39,15 +39,12 @@ for i in "$@" ; do
             __BuildArch=arm
             __UbuntuArch=armhf
             ;;
-        wily)
-            __LinuxCodeName=wily
+        trusty)
+            __LinuxCodeName=trusty
             ;;
         xenial)
             __LinuxCodeName=xenial
             ;;
-        zesty)
-            __LinuxCodeName=zesty
-            ;;
         --skipunmount)
             __SkipUnmount=1
             ;;
-- 
2.7.4