From bf943f865487b47affb56e1db927fcd3125c435c Mon Sep 17 00:00:00 2001
From: Rob Savoye <rob.savoye@linaro.org>
Date: Wed, 11 Nov 2015 19:31:20 -0700
Subject: wily-amd64-tcwg: update the package list

Build an image suitable for GNU toolchain testing.

Change-Id: I55647a88dc09c016406a1780cf3dc1686c741403
Signed-off-by: Rob Savoye <rob.savoye@linaro.org>
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 lsb-linuxfoundation.key    | 34 ++++++++++++++++++++++++++++++++++
 lsb-linuxfoundation.list   |  1 +
 wily-amd64-tcwg/Dockerfile | 27 ++++++++++++++++++++++++---
 wily-amd64-tcwg/build.sh   |  2 +-
 4 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 lsb-linuxfoundation.key
 create mode 100644 lsb-linuxfoundation.list

diff --git a/lsb-linuxfoundation.key b/lsb-linuxfoundation.key
new file mode 100644
index 00000000..7ab2087f
--- /dev/null
+++ b/lsb-linuxfoundation.key
@@ -0,0 +1,34 @@
+pub  1024D/47F5E454 2007-02-27 LSB Repository Signing Key <lsb-repo@linux-foundation.org>
+      Key fingerprint = 2CA3 AB2B 48F8 91B0 85EB  3378 9B14 C1F6 2CF4 470F
+sub   2048g/38D87345 2007-02-27
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+mQGiBEXkq90RBADfRHk0om7RXFzpFHHx29g7IRYOw3Oe6JtASy6ciKqpuoC1KGQj
+XZiFBFfPq1F5wE4XWWpJFgKsKbYdywtNnDkK12InDFnIkwvZrDhFlwx570ZKpTeE
+hxqrGNI19vtNTB69aOAsAF4wyaLyPY9/feQ4RlMY8z8Yf5OwuoP7sXt5DwCgoh05
+l5BzeRKDMWOrXm8ohwLs798EANHzpbpWTE6UhjgdbqRwSOgaKS3enI7+f1DqZfWl
+BMbDKD7yZglcAHQ9MOwEz/FHAs1srhAm4f6qk+TDcK/YOs7LwMfqdVaUbDFr2l0h
+o3ZVJ7kcb0L2sxq/Ms5zZbd9gMMRSew9lCrIqgdINpi/j0272pOUtDnkZ1npnTpG
+UHmPBACcvCE/GIngYOijY6kb7lmWC3Q2eS/2GzFb8HU01rcd+HuOKy/GDxSgfud+
+ZknSO0IfNQmbsdPfyMABaj3ZDqzhAkxb1wZgiTgTe2wSCAk+L+A4qe65lWgzeySG
+sYHIx65PzE4+HuMGO6MeSLkVUX6XEObt7ZAu5WwJm/KeIAC6RbQ6TFNCIFJlcG9z
+aXRvcnkgU2lnbmluZyBLZXkgPGxzYi1yZXBvQGxpbnV4LWZvdW5kYXRpb24ub3Jn
+PohgBBMRAgAgBQJF5KvdAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQmxTB
+9iz0Rw+oHwCff9R6vrzjOjXD+1hSAE7d4TSIdPEAoIybhNukA6xWlRmEUDy3omkP
+etZUuQINBEXkq/wQCADh0/QgeH9c67Se1qzo5x8rRt2zefqDyCQZjXJkYVN6JE3/
+ya6Tn80UjBbuk7oSc9+/tZK9DU7Ko7NtcUdfvfQ/VEJInX3NSjXwzpwjRFFy4e1t
+T8qGPMwfK/7Olm7ItAjqPmJKVG9iJkvZmozLyHxjifBihwr1deP5TiPAfoShd8Q2
+2M9zsdmoRMUjxgu4ARtE3lmk8abMUGCNQf/V8s6qFS2ogq70Y/W7FhWa8uzpGzfd
+WKZJo5w9oIkKfy/u3eCduah+MHsylkhxwuNcwQTlBvA7Bpr/TAwK7etgsOqYE0Jl
+wyRj6lTupVxwgsCJhmdDp5ctDBno0IdZhzt5wHJXAAQLB/92308FA4HN+aPirR0F
+vMIa5Rwd+Wx4qkenkeKN59BQqd6LtEDDkPFaSynRLrJEld2UPtmCpgRphlGJkDh7
+EK/2CD+WeW+QTFhNdb0HYhKOFHNYHg1mDwM2MjFYPM9tCJ/1FsqjO6aE8fX6T1UE
+1a1OqX7JLWfEatXyXGW4il76kaZmjP2U6k2bJn9HKGG4/xVJpw3zDDtPIu+wfiXU
+9gMk63zuTj4PSvy067wc+caPo1ZrHSEVCt7ZtHt9ve1VTO6ZgjPseqP57IeMwAwU
+9udCpLkKn7HWr2V19Yk2t5y34nebNkK7AAChVw3ZZ+YqCC+HTNdLBDwcSF93wN2S
+LsrZiEkEGBECAAkFAkXkq/wCGwwACgkQmxTB9iz0Rw/I4ACcDJxSEM7VylUGYEIm
+Gev/Vf1Cq7cAoKDpfqLRWxH2bUtmXD3Xj2e2jxCn
+=4M4A
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/lsb-linuxfoundation.list b/lsb-linuxfoundation.list
new file mode 100644
index 00000000..a4c15649
--- /dev/null
+++ b/lsb-linuxfoundation.list
@@ -0,0 +1 @@
+deb http://ftp.linuxfoundation.org/pub/lsb/repositories/debian lsb-5.0 main
diff --git a/wily-amd64-tcwg/Dockerfile b/wily-amd64-tcwg/Dockerfile
index c2e22d62..01d70b41 100644
--- a/wily-amd64-tcwg/Dockerfile
+++ b/wily-amd64-tcwg/Dockerfile
@@ -1,3 +1,6 @@
+# TCWG configuration with everything needed to build the GNU toolchain and test it.
+# To run the resulting image manually and mount /tmp to /mnt, use:
+#         docker run -i -v /tmp:/mnt -t tcwg/wily-amd64-tcwg /bin/bash
 FROM ubuntu:wily
 
 COPY *.list *.key /etc/apt/sources.list.d/
@@ -10,25 +13,42 @@ RUN dpkg --add-architecture i386 \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  alien \
  autoconf \
+ autogen \
  automake \
- bc \
  bison \
  build-essential \
- ccache \
+ byacc \
+ cm-super-minimal \
  curl \
  debhelper \
  dejagnu \
+ dh-autoreconf \
+ dh-translations \
+ distro-info-data \
+ fakeroot \
  flex \
  g++-multilib \
- gcc \
+ gawk \
  git \
+ liblzma-dev \
+ libncurses5-dev \
+ libreadline-dev \
+ libtool \
+ lsb-build-c++ \
+ lsb-build-cc \
  lsb-release \
  openjdk-7-jdk \
  openssh-server \
+ python3-dev \
  qemu-user-static \
  sudo \
+ texinfo \
+ texlive-fonts-recommended \
+ texlive-latex-recommended \
  time \
+ vim \
  wget \
+ zlib1g-dev \
  && wget -q http://de.archive.ubuntu.com/ubuntu/pool/main/m/make-dfsg/make_3.81-8.2ubuntu3_amd64.deb \
  && dpkg -i --force-all *.deb \
  && apt-mark hold make \
@@ -44,4 +64,5 @@ RUN useradd -m -p '$6$7tSX2YU5Q$ydZwAuWtNPPBb1Fv/tzy3eFeEP/ThDBUjV/4vHVx6bVyfYMX
  && echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins \
  && chmod 440 /etc/sudoers.d/jenkins \
  && mkdir -p /var/run/sshd \
+ && install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr/local/bin/git-new-workdir \
  && /usr/sbin/sshd
diff --git a/wily-amd64-tcwg/build.sh b/wily-amd64-tcwg/build.sh
index 7c5ae0c4..ac898e53 100755
--- a/wily-amd64-tcwg/build.sh
+++ b/wily-amd64-tcwg/build.sh
@@ -13,7 +13,7 @@ export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-*.list ../linaro-*.key ../lsb-*.list ../lsb-*.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
 docker build --tag=linaro/$(basename ${PWD}) .
-- 
cgit v1.2.3