diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2015-12-03 18:34:07 +0200 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2015-12-03 18:03:21 +0000 |
commit | 8edc44d20260de92cef7a88e2e4b55e2a89428a4 (patch) | |
tree | e6b700054548ea9c3b588df12dd7e0319e895b31 /96boards-hikey-mainline-rebase.yaml | |
parent | c5f150fe77c10a2af9ddda5c0699547d982aee51 (diff) |
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 '96boards-hikey-mainline-rebase.yaml')
-rw-r--r-- | 96boards-hikey-mainline-rebase.yaml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/96boards-hikey-mainline-rebase.yaml b/96boards-hikey-mainline-rebase.yaml index e09affce..45e27634 100644 --- a/96boards-hikey-mainline-rebase.yaml +++ b/96boards-hikey-mainline-rebase.yaml @@ -54,12 +54,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 - 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 @@ -192,8 +192,6 @@ sudo cp -a out/hi6220-hikey.dtb rootfs/boot/ (cd rootfs/boot && sudo ln -s initrd.img-* initrd.img) - sudo ln -sf /etc/resolvconf/run/resolv.conf rootfs/etc/resolv.conf - cat << EOF | sudo tee rootfs/etc/NetworkManager/dispatcher.d/99hikey #!/bin/sh |