{jessie,stretch,trusty,utopic,xenial}-{amd64,arm64,armhf}: fix build scripts

* docker COPY doesn't follow symlinks (it returns a lstat error)
  Restore stretch build scripts to copy thee files as before.
* Move OBS sources list and key files next to the others.
* Remove all the PPA fixup and copy explicitely sources list and keys we
  want.
* Fix the image/tag name jessie-amd64, xenial-adm64 and a few others.

Change-Id: I6613c5abc2bba8cbb05a65e0bf0dc17d4082cc1a
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

3 files changed, 12 insertions, 81 deletions

diff --git a/stretch-amd64/build.sh b/stretch-amd64/build.sh
index ca4c1c00..155a1b39 100755
--- a/stretch-amd64/build.sh
+++ b/stretch-amd64/build.sh
@@ -1,10 +1,21 @@
-#!/bin/bash -e
+#!/bin/sh
+
+set -e
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  rm -f *.list *.key
+}
 
 export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
+cp -a ../linaro-overlay-obs.list ../linaro-overlay-obs.key .
+
 image=linaro/ci-${ARCHITECTURE}-debian:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/stretch-amd64/linaro-overlay-obs.key b/stretch-amd64/linaro-overlay-obs.key
deleted file mode 100644
index 9a3b62dd..00000000
--- a/stretch-amd64/linaro-overlay-obs.key
+++ /dev/null
@@ -1,78 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFjScWoBEADG3dc026l2DSQjMH4AjSAiHILLTgf0VjjucNcFJv2jQE9Z9x9X
-Mp1naLrjKXW+ZoZobFATZa+syflQWB6BZAEdtm0o37wHE9BDJvAevVeqZAYCg2MW
-ONiAu836Pdjd1ZVXQNA8ECuAe5YNMvEwWY7H0mhZKu6s26cLbkM82FNv8Zgxy9FW
-h3i2kbwYBQ2aVgfDq02NVyamB7MExHZpDz/sLHoCfIubKzAV1Nf/EkDmVjzcc2mk
-0xGu0k95vn3qUNZ3XUrj0xkGJ7ziGERQhj5tIizD5Hx8qlpcGjR8OUXb0cU3rbik
-hiuGUdkNi4sFvDoCRt2N8/mFK58sZ3/SIN7sir1zbyMj7fd1gdHox4IUI6oMPNQi
-VSVHjWufYS+B7jL2uebk77OJgnUQBb5ZQxyo/NG+VkiYaRyHTTd/a4AmQ5GvQNQE
-MCZ8NlP+Zi2Z0nELJLPYpzcESuMuVBGfDbtlW8SQ8VtQC/FRV3tV/tBgfgIeDnet
-hDS3NsF967zcf6c1G2W60Vo8hb7YW0Cd/fjx3QnvqK8oQtHh6+WBEFNS50zAxsHy
-S0pP0NLNc7OfKWRd+IzYDnTnWK2XdLhfdaU66Di0PEVRleIBgE3cMIdSgyKcM/13
-sMY43zEAePkeS89QaHYlJ4bfIdUUFNDEcE0L5C+pV37c+EhCtMIEP7+ATQARAQAB
-tCZMaW5hcm8gT0JTIDxwYWNrYWdlc0BsaXN0cy5saW5hcm8ub3JnPokCTgQTAQgA
-OBYhBMHgwsfiR092wX/oq8MtoQKticK+BQJY0nFqAhsDBQsJCAcCBhUICQoLAgQW
-AgMBAh4BAheAAAoJEMMtoQKticK+/LcP/3mJCGRP2+9ViPmAXfj7kmhJ8cs3IRBW
-YZPszidCMjdyOVTb72tR1G6MbdrxvOzwY1oFdNZVY06M0k5JhOGz3wM3L3xGhhIM
-r8grJaW/FKPFQGhOk4JvBtIwT7HPPppN1s5gXX5+8oaMrjD3yVwlAwXVAYRxGRFD
-Ghz9rjq/N+7VdavMvDXGBPohk++mVKEBncB2SPHTXknuccpsslHIBzF6v26SLfej
-qEeTRP6h+aDZYI5HEwA8kTeyS9WLVBWn76MiUl1PpXVr4tMr2lvQDoMbpOC7v+Rj
-WBaoDnC95RiE7gQHGGWwDYV2NTGzYhnPEhJG/w3Lf9aQlmwZ03dgbiHu1LZo35Ze
-GK7f661ne2x/Mr9hXOpNT/10LQipjycj9tjThAI5KDBrwBEG18UXZnuqEBnt+JBd
-EmrSvWTXbjBcwSYLvzQYKz7M/XNwXOm77RQRxwLBLIl8EtrVfCKkP0xqZeXVkGoS
-w2XWejAdH23xjHMthfsWFr2Sjq6KPFvuBl+MKCX40MISZfN74oy1I3CHKmf82CIf
-UAZ8mOPztdFATLLNtK8pOb7w/7Kb4wbqrx1VeEbq7fIim/OsRaMrKaxakc088JkO
-Lh8uEeH3Qv4p6dmkGpTmNboqPJk1NyXA8QbfA21WIJzXt/cSuUX6EyoS6avX2vV/
-i/N0gSX7RPnbuQENBFjScWoBCADp52SyPuBzjA8mRYz82aFnuihhWQedJOMqAQNH
-O0Kk4Ytpj6u4oboWxyO95y0wMdd6sY5ID2lSIoEHeYBFv+fVmXefaDY+VtaZRpS1
-vJj2UYcosWmbGK25kYWMC1TK/nictDS40IrfXWBu94FMQinSPJbEvsEdSK7UIzVV
-mm4qKcqAt3mx/zsWIXrMTPFZLcXUOFGfaDHVG1V9POHaLzHQtDSX5VRUCI4SSRNa
-L44tsbEcmP0B3sy8oi1Q3fEenGmfLYscwxFcuRH4Mu2ZnUtI/2BLOzNpXApe7vpw
-gOw0suQajFVOlc4enRHNhMWCoGRBrMF3quOJ3v4dPFVln4KfABEBAAGJAjYEGAEI
-ACAWIQTB4MLH4kdPdsF/6KvDLaECrYnCvgUCWNJxagIbDAAKCRDDLaECrYnCvjSz
-EACXmPvUp4Q7m1dedW92LwMLGbH3EEDojWRjj/ayQ2qfoeuSp0OZenfLUb5Y2pdA
-mzwVFI2De4zDOOgtaUFI5GAKcyLcEsfDwtK+l1j2Hq6jPpEhLIq17/2MQS2NsT+O
-nRdGkjFfGxXAYYIaUurcYeBMtVK8JJGgX02qYE3MYtptC54G5SgSfSp19YLS3+s6
-WLM+hkLeDES23nbyl6wQazN8gLiQbyi+HK8iTv8fW+kJLgN/mT+fwXEBvgfCA7ID
-b12K0gAo3lSz98OfSDKKrDMuYm4CgnTm9ANsTkiLlLb7285gWmoNdKKTmhMiT8IN
-8Cm2I7WZTckGlhwnNGTXuyAlwU1tt2bKL5hXIVMVfInxlFKGNKMLNcQXHoIZs5dp
-QvC4sinQETF4dZGSad/wX+jbdU5B1n4yz4VuyWdKI0a/HQzadmcDOoj4bMk9dCNI
-fAqAMLq0dzQldoE8hexLdwe2Jg1IXJ3vpUe17lnmlc7O2IQdkbBDM9BG/LyepMvL
-yWKN3dkC++SWxHTbeoCgC2H1BkL7noGDgcqrkMbBbap91zpUWgllrI6QDO8SvM9i
-/C9JvSlXkg3+LTaXsjuD6kr2Dv23lZixWcCu2VLdWDD95l5y5E5h4A0CgH9qoyFe
-37r930LkTHd6YpIbn6QtD0ZyweUgmu6kFS7oKoaJu8D/2bkDLgRY0nKPEQgA+YLJ
-zyHaUXNobNojXi4hf7TJol4qXMlYlbZEqxGY/vANf+3/1GqShEF/e7t/LiLaM2ep
-GTxOyFUhdsaiBmTjy9KKxd3EfCB7fmjKlw+4EbSyjo/6+uTad6K68YKw0dfxKix6
-qhloXk0+0Mq58KDeIGx8XhAIh4ogrH06uvno3y0mIfXzD11LXuEvsLSJ+ElBV9Xl
-+l2mfMC+gAyAFlap6CliVy6nhDjeHAhr1fdH5ZRHa6/FXGTzoB8qCDDBEcf49gJW
-Etzvk9LsO+NTiiQ5PoxQUBQ41nGRicgq2IWSi3411LmsZh4WoX9gNIRQaeKCbFC3
-J5Vx2gik78N1+SBZLwEAwpRUZnJS5UG88nBfga/lFH35Y/pn0GrriZKwFYb0GOcH
-/0pGs2zRrPH29VOSrqIA1+WZz8GvwZk0FXWwnN+0MoA0dLPhm+8KiXSu25zlS/gj
-TnO31oQ+2/F0sSPxFUvWKuzmcaeKSrCfn18/jw+oCua+xoHaBWk6Shp/1WVWdkXr
-NhHNRWZdQRkFGNf2hbZv7ESv77nl1HyHqDzpEVVnod0f1VsnFrge/vwhu3SHwxhw
-/iso0PldvSdQnAH0mP76ihXy5bv0lKqYMcKgQwPtTYY+9llhDwEKJhjfVdHky76E
-c1gILus/9nvQRAOZrDwYgF8PSyMFAzQoZatHFz/E6/W4fpuKpFwqkC6rmUam0EXQ
-QUAUVNxDds3qKcCY3xhxgb0IAKIrAvjlLCKbxjl4VyDLrBFYjMMYHQJj2Dsf2Qfr
-52PmEEGuAPbB+UUlGCrITISXAlTGM1Vyhqd6wGlyyYCZE9YjCKB/x6MGZXwACO3j
-8/A6+esanFfqvYZ39zGS6GLmLqdoIvf5qJe1Ye4dFcNHkuhH91FR+aYyKbDdFY3Q
-hZRP8nXSjNwiATdCa2OeCPAOswQunVZ8Q3BcTkkT/mnic4ZaN6vUSJp6HjEghW0R
-7Nm3sPJne93+ELLBJlBNvQ+I4JfVSRF+UEHbHgy84UyO/OUTheRpitj0wh6Qci3x
-nwRWsCtcugHbygZIWDV7WvjbRfE12J8Efvx51r2JI7OyiyWJAq0EGAEIACAWIQTB
-4MLH4kdPdsF/6KvDLaECrYnCvgUCWNJyjwIbAgCBCRDDLaECrYnCvnYgBBkRCAAd
-FiEEO8sB1dZAYZfWRBRdFetWFc5RIDEFAljSco8ACgkQFetWFc5RIDFSjwD/SQ77
-Tcvwx6MOkVkUTv2xJBb4mZZYjAPauaizR0X2QHkA/2Eh6zfIGuYnTI/o1fPsF2j2
-F4rSd5YIhacn7WDKu+NlgLIP/2ioxpohCWKphPH9Q2AGyZ7HrIJHYZQ4r36xQhrT
-tlB5hyUNnU94eXgP0WMgmK18SbRrTaE3kODMATeT6IoeGrRzcn8kM4KHDkUBrSCk
-UuQ7DOwvAhzJyoFr6MgMo9DRLauL7hi2nVx4vWezIMkKQsoSVcE4CQ3h6xW+fbi/
-G21J8wgk02lR7hJjKv/DWpc2qo0ZgZtldWq+PrbJ1TZh0n+4SOxZagPMsb2G9Y+d
-NScUvcoy3fu4E92U6xcVdqD98XElkLbHeT5BIdPuMU95+hyMVhmY4uhnau9eK+iw
-yLfOCinWIm1zhkAB1RzvksleQWG8EJw13l3fJV3UKlKzkUvdw3tX7AsAL9PfnBfu
-zgktildE7NQ6IZY3pqs0epR8roDU1EXc/lD2xAu7++KpulwVXKsCwrCyTW4SbfSO
-PNxHOs7RpXYpqQtVMRNSzi0GpRXmf2Bm/+L2BjsPsVjuqFKN9LFE9YCgLZub2SF6
-vkhqzvZz+QbzCNx90onVfMFtIv9qS7CXPO2sMNHEPP1SI7PdTuEjVGANoSug77vb
-kzcxup7vTflmnCfU7gt+xE5NNzocy3uCGHrC+F9dRJy6tmthKoRaBbVutx2zM52w
-XlcCjMjjkp2CoTiyyVnQYP4f7fXKih8M4Af141aGwlwxyPPZ8uXfYaMWdVAMbmOT
-iue2
-=GWuy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/stretch-amd64/linaro-overlay-obs.list b/stretch-amd64/linaro-overlay-obs.list
deleted file mode 100644
index 87981100..00000000
--- a/stretch-amd64/linaro-overlay-obs.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://obs.linaro.org/linaro-overlay-stretch/Debian_9.0/ ./
-deb-src http://obs.linaro.org/linaro-overlay-stretch/Debian_9.0/ ./