96boards-dragonboard845c-aosp-master: update for focal docker image

with fixing the packages to be installed

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: I0eb3c1beaf1dea67530a2cd8d2af5a7ebd2db214

2 files changed, 23 insertions, 25 deletions

diff --git a/96boards-dragonboard845c-aosp-master/builders.sh b/96boards-dragonboard845c-aosp-master/builders.sh
index b5f03e4f23..eeb1d01943 100644
--- a/96boards-dragonboard845c-aosp-master/builders.sh
+++ b/96boards-dragonboard845c-aosp-master/builders.sh
@@ -2,19 +2,20 @@
 
 # Install needed packages
 sudo apt-get update
-sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time genisoimage patch mtools rsync liblz4-tool lzop libssl-dev libdrm-intel1 python3-pip
-
-wget -q \
-  http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
-  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
-  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
-  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
-sudo dpkg -i --force-all *.deb
-rm -f *.deb
-
-# FIXME jinja2-cli and ruamel.yaml==0.16.13 installer is broken
-# Install jinja2-cli and ruamel.yaml==0.16.13
-#pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
+
+# Here is for packages not listed by the source.android.com site below.
+# But the following packages might not be really necessary,
+# as the docker image for docker-focal-aosp labelled nodes is linaro/jenkins-amd64-ubuntu:focal
+# which is defined here: https://git.linaro.org/infrastructure/ci-yadp-builder.git/tree/docker_templates_aosp_amd64.yml#n2
+# And the packages listed here might be already defined there.
+sudo apt-get install -y --allow-change-held-packages wget sudo python3 python-is-python3 openjdk-11-jdk-headless
+java -version
+
+## https://source.android.com/docs/setup/start/requirements#hardware-requirements
+sudo apt-get install -y --allow-change-held-packages git-core gnupg flex bison build-essential zip curl zlib1g-dev libc6-dev-i386 libncurses5 x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig
+
+## keep the same package as listed here before
+sudo apt-get install -y python-mako gperf time genisoimage patch mtools rsync liblz4-tool lzop libssl-dev libdrm-intel1 python3-pip
 
 # Set local configuration
 git config --global user.email "ci_notify@linaro.org"
diff --git a/android-lcr/common/builders.sh b/android-lcr/common/builders.sh
index 31f94e5f82..8eba8a6358 100755
--- a/android-lcr/common/builders.sh
+++ b/android-lcr/common/builders.sh
@@ -2,20 +2,17 @@
 
 # Install needed packages
 sudo apt-get update
-sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time genisoimage patch mtools rsync liblz4-tool lzop libssl-dev libdrm-intel1 python3-pip python3-pip python-pyelftools python3-pyelftools python-crypto python3-crypto
 
-wget -q \
-  http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
-  http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
-  http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
-  http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
-sudo dpkg -i --force-all *.deb
-rm -f *.deb
+# Here is for packages not listed by the source.android.com site below.
+# But the following packages might not be really necessary,
+# as the docker image for docker-focal-aosp labelled nodes is linaro/jenkins-amd64-ubuntu:focal
+# which is defined here: https://git.linaro.org/infrastructure/ci-yadp-builder.git/tree/docker_templates_aosp_amd64.yml#n2
+# And the packages listed here might be already defined there.
+sudo apt-get install -y --allow-change-held-packages wget sudo python3 python-is-python3 openjdk-11-jdk-headless
+java -version
 
-#change to use python3 by default
-if ! python --version|grep 3; then
-    sudo rm -fv /usr/bin/python && sudo ln -s /usr/bin/python3 /usr/bin/python
-fi
+## https://source.android.com/docs/setup/start/requirements#hardware-requirements
+sudo apt-get install -y --allow-change-held-packages git-core gnupg flex bison build-essential zip curl zlib1g-dev libc6-dev-i386 libncurses5 x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig
 
 # Install jinja2-cli and ruamel.yaml==0.16.13
 pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13 pycryptodome pycryptodomex