diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2016-11-17 07:19:23 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-11-17 07:43:27 +0200 |
| commit | aae99303267a59a0e7110a35616f4290d348b325 (patch) | |
| tree | 3536f5b56a19bdc3c29a93012c909fc4a5ba0cf5 /trusty-armhf-tcwg | |
| parent | 9646491b360ebcbaf147c43cae5be413a75953fb (diff) | |
trusty-*-tcwg*: remove lsb-linuxfoundation repository
There isn't any packages pulled from lsb-lf repository anymore.
As the repository isn't used, remove it.
We don't add any 3rd party repository either, remove apt-key call and
the related handling in build.sh script.
Change-Id: I07195118239bbf658930bec4daf9121b82334574
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'trusty-armhf-tcwg')
| -rw-r--r-- | trusty-armhf-tcwg/Dockerfile | 2 | ||||
| -rwxr-xr-x | trusty-armhf-tcwg/build.sh | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/trusty-armhf-tcwg/Dockerfile b/trusty-armhf-tcwg/Dockerfile index 61cf970..9a480e9 100644 --- a/trusty-armhf-tcwg/Dockerfile +++ b/trusty-armhf-tcwg/Dockerfile @@ -1,10 +1,8 @@ FROM quay.io/fathi_boudra/ubuntu:trusty-armhf -COPY *.list *.key /etc/apt/sources.list.d/ COPY tcwg-buildslave/.ssh /etc/skel/.ssh RUN echo 'deb http://ports.ubuntu.com/ubuntu-ports trusty main universe' > /etc/apt/sources.list \ - && apt-key add /etc/apt/sources.list.d/*.key \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y devscripts \ diff --git a/trusty-armhf-tcwg/build.sh b/trusty-armhf-tcwg/build.sh index 8db5c81..5a74c33 100755 --- a/trusty-armhf-tcwg/build.sh +++ b/trusty-armhf-tcwg/build.sh @@ -6,17 +6,11 @@ trap cleanup_exit INT TERM EXIT cleanup_exit() { - rm -f *.list *.key rm -rf tcwg-buildslave } export LANG=C -DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-') - -cp -a ../linaro-*.list ../linaro-*.key . -sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list - rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/ docker build --pull --tag=linaro/$(basename ${PWD}) . |