aboutsummaryrefslogtreecommitdiff
path: root/lt-qcom-debian-images.yaml
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2015-12-03 18:34:07 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2015-12-03 18:03:21 +0000
commit8edc44d20260de92cef7a88e2e4b55e2a89428a4 (patch)
treee6b700054548ea9c3b588df12dd7e0319e895b31 /lt-qcom-debian-images.yaml
parentc5f150fe77c10a2af9ddda5c0699547d982aee51 (diff)
downloadconfigs-8edc44d20260de92cef7a88e2e4b55e2a89428a4.tar.gz
Get rid of linaro-hwpack-install workaround
Upgrade to latest linaro-image-tools release, which includes: - linaro-hwpack-install fix - resolv.conf symlink fix Get rid of the resolv.conf hack. Note: we still have to install l-i-t at build time until docker build slaves are updated. Change-Id: Ibb928601623102386302e2eae3921b54c77c08ce Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'lt-qcom-debian-images.yaml')
-rw-r--r--lt-qcom-debian-images.yaml14
1 files changed, 6 insertions, 8 deletions
diff --git a/lt-qcom-debian-images.yaml b/lt-qcom-debian-images.yaml
index 2b6916666..e4b5bbe6f 100644
--- a/lt-qcom-debian-images.yaml
+++ b/lt-qcom-debian-images.yaml
@@ -91,12 +91,12 @@
sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
sudo apt-get update
sudo apt-get install -y kpartx python-pycurl device-tree-compiler zip
- wget http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb
- sudo dpkg -i --force-all android-tools-fsutils_*.deb
- rm -f android-tools-fsutils_*.deb
- # FIXME - temporary workaround
- sudo wget https://git.linaro.org/ci/linaro-image-tools.git/blob_plain/HEAD:/linaro-hwpack-install -O /usr/bin/linaro-hwpack-install
- sudo chmod +x /usr/bin/linaro-hwpack-install
+ 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://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2015.11-1.linarojessie.1_amd64.deb \
+ http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2015.11-1.linarojessie.1_all.deb
+ sudo dpkg -i --force-all *.deb
+ rm -f *.deb
export LANG=C
export make_bootwrapper=false
@@ -225,8 +225,6 @@
[ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
done
- sudo ln -sf /etc/resolvconf/run/resolv.conf rootfs/etc/resolv.conf
-
sudo rm -rf rootfs/dev rootfs/boot rootfs/var/lib/apt/lists
sudo mkdir rootfs/dev rootfs/boot rootfs/var/lib/apt/lists