The Trusty sysroot was only used for building Chromium for ARM.  Since
this is now the responsibility of the Jessie sysroot, the Trusty
sysroot can be removed.

R=thestig@chromium.org,sbc@chromium.org

Review-Url: https://codereview.chromium.org/2859323002
Cr-Original-Commit-Position: refs/heads/master@{#469565}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 19e8945a7c43de08fdd74f31241d67c327289e0d
This commit is contained in:
thomasanderson 2017-05-04 18:30:24 -07:00 коммит произвёл Commit bot
Родитель 6661121c8e
Коммит 0fffbdfeb6
5 изменённых файлов: 6 добавлений и 371 удалений

Просмотреть файл

@ -6,8 +6,8 @@
"""Merge package entries from different package lists.
"""
# This is used for replacing packages in eg. trusty with those in
# trusty-updates. The updated packages are ABI compatible, but
# This is used for replacing packages in eg. jessie with those in
# jessie-updates. The updated packages are ABI compatible, but
# include security patches, so we should use those instead in our
# sysroots.

Просмотреть файл

@ -1,163 +0,0 @@
main/a/alsa-lib/libasound2_1.0.27.2-3ubuntu7_armhf.deb
main/a/alsa-lib/libasound2-dev_1.0.27.2-3ubuntu7_armhf.deb
main/a/atk1.0/libatk1.0-0_2.10.0-2ubuntu2_armhf.deb
main/a/atk1.0/libatk1.0-dev_2.10.0-2ubuntu2_armhf.deb
main/a/avahi/libavahi-client3_0.6.31-4ubuntu1.1_armhf.deb
main/a/avahi/libavahi-common3_0.6.31-4ubuntu1.1_armhf.deb
main/b/bluez/libbluetooth3_4.101-0ubuntu13.1_armhf.deb
main/b/bluez/libbluetooth-dev_4.101-0ubuntu13.1_armhf.deb
main/c/cairo/libcairo2_1.13.0~20140204-0ubuntu1.1_armhf.deb
main/c/cairo/libcairo2-dev_1.13.0~20140204-0ubuntu1.1_armhf.deb
main/c/cairo/libcairo-gobject2_1.13.0~20140204-0ubuntu1.1_armhf.deb
main/c/cairo/libcairo-script-interpreter2_1.13.0~20140204-0ubuntu1.1_armhf.deb
main/c/cups/libcups2_1.7.2-0ubuntu1.8_armhf.deb
main/c/cups/libcups2-dev_1.7.2-0ubuntu1.8_armhf.deb
main/d/dbus-glib/libdbus-glib-1-2_0.100.2-1_armhf.deb
main/d/dbus/libdbus-1-3_1.6.18-0ubuntu4.5_armhf.deb
main/d/dbus/libdbus-1-dev_1.6.18-0ubuntu4.5_armhf.deb
main/e/e2fsprogs/comerr-dev_2.1-1.42.9-3ubuntu1.3_armhf.deb
main/e/e2fsprogs/libcomerr2_1.42.9-3ubuntu1.3_armhf.deb
main/e/eglibc/libc6_2.19-0ubuntu6.11_armhf.deb
main/e/eglibc/libc6-dev_2.19-0ubuntu6.11_armhf.deb
main/e/elfutils/libelf1_0.158-0ubuntu5.2_armhf.deb
main/e/elfutils/libelf-dev_0.158-0ubuntu5.2_armhf.deb
main/e/expat/libexpat1_2.1.0-4ubuntu1.3_armhf.deb
main/e/expat/libexpat1-dev_2.1.0-4ubuntu1.3_armhf.deb
main/f/fontconfig/libfontconfig1_2.11.0-0ubuntu4.2_armhf.deb
main/f/fontconfig/libfontconfig1-dev_2.11.0-0ubuntu4.2_armhf.deb
main/f/freetype/libfreetype6_2.5.2-1ubuntu2.7_armhf.deb
main/f/freetype/libfreetype6-dev_2.5.2-1ubuntu2.7_armhf.deb
main/g/gcc-4.8/gcc-4.8_4.8.4-2ubuntu1~14.04.3_armhf.deb
main/g/gcc-4.8/libgomp1_4.8.4-2ubuntu1~14.04.3_armhf.deb
main/g/gcc-4.8/libstdc++-4.8-dev_4.8.4-2ubuntu1~14.04.3_armhf.deb
main/g/gcc-4.8/libstdc++6_4.8.4-2ubuntu1~14.04.3_armhf.deb
main/g/gccgo-4.9/libgcc1_4.9.3-0ubuntu4_armhf.deb
main/g/gconf/libgconf2-4_3.2.6-0ubuntu2_armhf.deb
main/g/gconf/libgconf-2-4_3.2.6-0ubuntu2_armhf.deb
main/g/gconf/libgconf2-dev_3.2.6-0ubuntu2_armhf.deb
main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.30.7-0ubuntu1.6_armhf.deb
main/g/gdk-pixbuf/libgdk-pixbuf2.0-dev_2.30.7-0ubuntu1.6_armhf.deb
main/g/glib2.0/libglib2.0-0_2.40.2-0ubuntu1_armhf.deb
main/g/glib2.0/libglib2.0-dev_2.40.2-0ubuntu1_armhf.deb
main/g/gnutls26/libgnutls26_2.12.23-12ubuntu2.7_armhf.deb
main/g/gnutls26/libgnutls-dev_2.12.23-12ubuntu2.7_armhf.deb
main/g/gnutls26/libgnutls-openssl27_2.12.23-12ubuntu2.7_armhf.deb
main/g/gnutls26/libgnutlsxx27_2.12.23-12ubuntu2.7_armhf.deb
main/g/gtk+2.0/libgtk2.0-0_2.24.23-0ubuntu1.4_armhf.deb
main/g/gtk+2.0/libgtk2.0-dev_2.24.23-0ubuntu1.4_armhf.deb
main/g/gtk+3.0/libgtk-3-0_3.10.8-0ubuntu1.6_armhf.deb
main/g/gtk+3.0/libgtk-3-dev_3.10.8-0ubuntu1.6_armhf.deb
main/k/keyutils/libkeyutils1_1.5.6-1_armhf.deb
main/k/krb5/krb5-multidev_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libgssapi-krb5-2_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libgssrpc4_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libk5crypto3_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libkadm5clnt-mit9_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libkadm5srv-mit9_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libkdb5-7_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libkrb5-3_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libkrb5-dev_1.12+dfsg-2ubuntu5.3_armhf.deb
main/k/krb5/libkrb5support0_1.12+dfsg-2ubuntu5.3_armhf.deb
main/libc/libcap2/libcap2_2.24-0ubuntu2_armhf.deb
main/libc/libcap2/libcap-dev_2.24-0ubuntu2_armhf.deb
main/libd/libdrm/libdrm2_2.4.67-1ubuntu0.14.04.1_armhf.deb
main/libf/libffi/libffi6_3.1~rc1+r3.0.13-12ubuntu0.1_armhf.deb
main/libg/libgcrypt11/libgcrypt11_1.5.3-2ubuntu4.4_armhf.deb
main/libg/libgcrypt11/libgcrypt11-dev_1.5.3-2ubuntu4.4_armhf.deb
main/libg/libgnome-keyring/libgnome-keyring0_3.8.0-2_armhf.deb
main/libg/libgnome-keyring/libgnome-keyring-dev_3.8.0-2_armhf.deb
main/libg/libgpg-error/libgpg-error0_1.12-0.2ubuntu1_armhf.deb
main/libg/libgpg-error/libgpg-error-dev_1.12-0.2ubuntu1_armhf.deb
main/libn/libnss-db/libnss-db_2.2.3pre1-5build3_armhf.deb
main/libp/libp11/libp11-2_0.2.8-3ubuntu1_armhf.deb
main/libp/libpng/libpng12-0_1.2.50-1ubuntu2.14.04.2_armhf.deb
main/libp/libpng/libpng12-dev_1.2.50-1ubuntu2.14.04.2_armhf.deb
main/libs/libselinux/libselinux1_2.2.2-1ubuntu0.1_armhf.deb
main/libt/libtasn1-6/libtasn1-6_3.4-3ubuntu0.4_armhf.deb
main/libx/libx11/libx11-6_1.6.2-1ubuntu2_armhf.deb
main/libx/libx11/libx11-dev_1.6.2-1ubuntu2_armhf.deb
main/libx/libx11/libx11-xcb1_1.6.2-1ubuntu2_armhf.deb
main/libx/libx11/libx11-xcb-dev_1.6.2-1ubuntu2_armhf.deb
main/libx/libxau/libxau6_1.0.8-1_armhf.deb
main/libx/libxau/libxau-dev_1.0.8-1_armhf.deb
main/libx/libxcb/libxcb1_1.10-2ubuntu1_armhf.deb
main/libx/libxcb/libxcb1-dev_1.10-2ubuntu1_armhf.deb
main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1_armhf.deb
main/libx/libxcb/libxcb-render0_1.10-2ubuntu1_armhf.deb
main/libx/libxcb/libxcb-render0-dev_1.10-2ubuntu1_armhf.deb
main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1_armhf.deb
main/libx/libxcb/libxcb-shm0-dev_1.10-2ubuntu1_armhf.deb
main/libx/libxcomposite/libxcomposite1_0.4.4-1_armhf.deb
main/libx/libxcomposite/libxcomposite-dev_0.4.4-1_armhf.deb
main/libx/libxcursor/libxcursor1_1.1.14-1_armhf.deb
main/libx/libxcursor/libxcursor-dev_1.1.14-1_armhf.deb
main/libx/libxdamage/libxdamage1_1.1.4-1ubuntu1_armhf.deb
main/libx/libxdamage/libxdamage-dev_1.1.4-1ubuntu1_armhf.deb
main/libx/libxdmcp/libxdmcp6_1.1.1-1_armhf.deb
main/libx/libxext/libxext6_1.3.2-1ubuntu0.0.14.04.1_armhf.deb
main/libx/libxext/libxext-dev_1.3.2-1ubuntu0.0.14.04.1_armhf.deb
main/libx/libxfixes/libxfixes3_5.0.1-1ubuntu1.1_armhf.deb
main/libx/libxfixes/libxfixes-dev_5.0.1-1ubuntu1.1_armhf.deb
main/libx/libxi/libxi6_1.7.1.901-1ubuntu1.1_armhf.deb
main/libx/libxi/libxi-dev_1.7.1.901-1ubuntu1.1_armhf.deb
main/libx/libxinerama/libxinerama1_1.1.3-1_armhf.deb
main/libx/libxinerama/libxinerama-dev_1.1.3-1_armhf.deb
main/libx/libxrandr/libxrandr2_1.5.0-1~trusty1_armhf.deb
main/libx/libxrandr/libxrandr-dev_1.5.0-1~trusty1_armhf.deb
main/libx/libxrender/libxrender1_0.9.8-1build0.14.04.1_armhf.deb
main/libx/libxrender/libxrender-dev_0.9.8-1build0.14.04.1_armhf.deb
main/libx/libxss/libxss1_1.2.2-1_armhf.deb
main/libx/libxss/libxss-dev_1.2.2-1_armhf.deb
main/libx/libxt/libxt6_1.1.4-1_armhf.deb
main/libx/libxt/libxt-dev_1.1.4-1_armhf.deb
main/libx/libxtst/libxtst6_1.2.2-1_armhf.deb
main/libx/libxtst/libxtst-dev_1.2.2-1_armhf.deb
main/libx/libxxf86vm/libxxf86vm1_1.1.3-1_armhf.deb
main/l/linux/linux-libc-dev_3.13.0-117.164_armhf.deb
main/m/mesa/libgbm1_10.1.3-0ubuntu0.6_armhf.deb
main/m/mesa/libgbm-dev_10.1.3-0ubuntu0.6_armhf.deb
main/m/mesa/libgl1-mesa-dev_10.1.3-0ubuntu0.6_armhf.deb
main/m/mesa/libgl1-mesa-glx_10.1.3-0ubuntu0.6_armhf.deb
main/m/mesa/libglapi-mesa_10.1.3-0ubuntu0.6_armhf.deb
main/m/mesa/mesa-common-dev_10.1.3-0ubuntu0.6_armhf.deb
main/n/nspr/libnspr4_4.13.1-0ubuntu0.14.04.1_armhf.deb
main/n/nspr/libnspr4-dev_4.13.1-0ubuntu0.14.04.1_armhf.deb
main/n/nss/libnss3_3.28.4-0ubuntu0.14.04.1_armhf.deb
main/n/nss/libnss3-dev_3.28.4-0ubuntu0.14.04.1_armhf.deb
main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.22_armhf.deb
main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.22_armhf.deb
main/o/orbit2/liborbit2_2.14.19-0.3_armhf.deb
main/p/p11-kit/libp11-kit0_0.20.2-2ubuntu2_armhf.deb
main/p/pam/libpam0g_1.1.8-1ubuntu2.2_armhf.deb
main/p/pam/libpam0g-dev_1.1.8-1ubuntu2.2_armhf.deb
main/p/pango1.0/libpango-1.0-0_1.36.3-1ubuntu1.1_armhf.deb
main/p/pango1.0/libpango1.0-dev_1.36.3-1ubuntu1.1_armhf.deb
main/p/pango1.0/libpangocairo-1.0-0_1.36.3-1ubuntu1.1_armhf.deb
main/p/pango1.0/libpangoft2-1.0-0_1.36.3-1ubuntu1.1_armhf.deb
main/p/pango1.0/libpangoxft-1.0-0_1.36.3-1ubuntu1.1_armhf.deb
main/p/pciutils/libpci3_3.2.1-1ubuntu5.1_armhf.deb
main/p/pciutils/libpci-dev_3.2.1-1ubuntu5.1_armhf.deb
main/p/pcre3/libpcre3_8.31-2ubuntu2.3_armhf.deb
main/p/pcre3/libpcre3-dev_8.31-2ubuntu2.3_armhf.deb
main/p/pcre3/libpcrecpp0_8.31-2ubuntu2.3_armhf.deb
main/p/pixman/libpixman-1-0_0.30.2-2ubuntu1.1_armhf.deb
main/p/pixman/libpixman-1-dev_0.30.2-2ubuntu1.1_armhf.deb
main/p/pulseaudio/libpulse0_4.0-0ubuntu11.1_armhf.deb
main/p/pulseaudio/libpulse-dev_4.0-0ubuntu11.1_armhf.deb
main/p/pulseaudio/libpulse-mainloop-glib0_4.0-0ubuntu11.1_armhf.deb
main/s/speech-dispatcher/libspeechd2_0.8-5ubuntu1_armhf.deb
main/s/speech-dispatcher/libspeechd-dev_0.8-5ubuntu1_armhf.deb
main/s/speech-dispatcher/speech-dispatcher_0.8-5ubuntu1_armhf.deb
main/x/x11proto-composite/x11proto-composite-dev_0.4.2-2_all.deb
main/x/x11proto-core/x11proto-core-dev_7.0.26-1~ubuntu2_all.deb
main/x/x11proto-damage/x11proto-damage-dev_1.2.1-2_all.deb
main/x/x11proto-fixes/x11proto-fixes-dev_5.0-2ubuntu2_all.deb
main/x/x11proto-input/x11proto-input-dev_2.3-1_all.deb
main/x/x11proto-kb/x11proto-kb-dev_1.0.6-2_all.deb
main/x/x11proto-randr/x11proto-randr-dev_1.5.0-1~trusty1_all.deb
main/x/x11proto-record/x11proto-record-dev_1.14.2-1_all.deb
main/x/x11proto-render/x11proto-render-dev_0.11.1-2_all.deb
main/x/x11proto-scrnsaver/x11proto-scrnsaver-dev_1.2.2-1_all.deb
main/x/x11proto-xext/x11proto-xext-dev_7.3.0-1_all.deb
main/z/zlib/zlib1g_1.2.8.dfsg-1ubuntu1_armhf.deb
main/z/zlib/zlib1g-dev_1.2.8.dfsg-1ubuntu1_armhf.deb

Просмотреть файл

@ -1,196 +0,0 @@
#!/bin/bash
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DISTRO=ubuntu
DIST=trusty
DIST_UPDATES=trusty-updates
# This is where we get all the debian packages from.
APT_REPO=http://archive.ubuntu.com/ubuntu
APT_REPO_ARM=http://ports.ubuntu.com
APT_REPO_ARM64=http://ports.ubuntu.com
KEYRING_FILE=/usr/share/keyrings/ubuntu-archive-keyring.gpg
HAS_ARCH_ARM=1
# Trusty supports these architectures but they are not needed by chrome.
# HAS_ARCH_AMD64=1
# HAS_ARCH_I386=1
# HAS_ARCH_ARM64=1
# Sysroot packages: these are the packages needed to build chrome.
# NOTE: When DEBIAN_PACKAGES is modified, the packagelist files must be updated
# by running this script in GeneratePackageList mode.
DEBIAN_PACKAGES="\
comerr-dev
gcc-4.8
krb5-multidev
libasound2
libasound2-dev
libatk1.0-0
libatk1.0-dev
libavahi-client3
libavahi-common3
libbluetooth3
libbluetooth-dev
libc6
libc6-dev
libcairo2
libcairo2-dev
libcairo-gobject2
libcairo-script-interpreter2
libcap-dev
libcap2
libcomerr2
libcups2
libcups2-dev
libdbus-1-3
libdbus-1-dev
libdbus-glib-1-2
libdrm2
libelf1
libelf-dev
libexpat1
libexpat1-dev
libffi6
libfontconfig1
libfontconfig1-dev
libfreetype6
libfreetype6-dev
libgbm1
libgbm-dev
libgcc1
libgconf-2-4
libgconf2-4
libgconf2-dev
libgcrypt11
libgcrypt11-dev
libgdk-pixbuf2.0-0
libgdk-pixbuf2.0-dev
libgl1-mesa-dev
libgl1-mesa-glx
libglapi-mesa
libglib2.0-0
libglib2.0-dev
libgnome-keyring0
libgnome-keyring-dev
libgnutls26
libgnutls-dev
libgnutls-openssl27
libgnutlsxx27
libgomp1
libgpg-error0
libgpg-error-dev
libgssapi-krb5-2
libgssrpc4
libgtk-3-0
libgtk-3-dev
libgtk2.0-0
libgtk2.0-dev
libk5crypto3
libkadm5clnt-mit9
libkadm5srv-mit9
libkdb5-7
libkeyutils1
libkrb5-3
libkrb5-dev
libkrb5support0
libnspr4
libnspr4-dev
libnss3
libnss3-dev
libnss-db
liborbit2
libp11-2
libp11-kit0
libpam0g
libpam0g-dev
libpango-1.0-0
libpango1.0-dev
libpangocairo-1.0-0
libpangoft2-1.0-0
libpangoxft-1.0-0
libpci3
libpci-dev
libpcre3
libpcre3-dev
libpcrecpp0
libpixman-1-0
libpixman-1-dev
libpng12-0
libpng12-dev
libpulse0
libpulse-dev
libpulse-mainloop-glib0
libselinux1
libspeechd2
libspeechd-dev
libssl1.0.0
libssl-dev
libstdc++6
libstdc++-4.8-dev
libtasn1-6
libx11-6
libx11-dev
libx11-xcb1
libx11-xcb-dev
libxau6
libxau-dev
libxcb1
libxcb1-dev
libxcb-glx0
libxcb-render0
libxcb-render0-dev
libxcb-shm0
libxcb-shm0-dev
libxcomposite1
libxcomposite-dev
libxcursor1
libxcursor-dev
libxdamage1
libxdamage-dev
libxdmcp6
libxext6
libxext-dev
libxfixes3
libxfixes-dev
libxi6
libxi-dev
libxinerama1
libxinerama-dev
libxrandr2
libxrandr-dev
libxrender1
libxrender-dev
libxss1
libxss-dev
libxt6
libxt-dev
libxtst6
libxtst-dev
libxxf86vm1
linux-libc-dev
mesa-common-dev
speech-dispatcher
x11proto-composite-dev
x11proto-core-dev
x11proto-damage-dev
x11proto-fixes-dev
x11proto-input-dev
x11proto-kb-dev
x11proto-randr-dev
x11proto-record-dev
x11proto-render-dev
x11proto-scrnsaver-dev
x11proto-xext-dev
zlib1g
zlib1g-dev
"
DEBIAN_PACKAGES_X86="libquadmath0"
. "${SCRIPT_DIR}/sysroot-creator.sh"

Просмотреть файл

@ -3,11 +3,11 @@
# found in the LICENSE file.
#
# This script should not be run directly but sourced by the other
# scripts (e.g. sysroot-creator-trusty.sh). Its up to the parent scripts
# scripts (e.g. sysroot-creator-jessie.sh). Its up to the parent scripts
# to define certain environment variables: e.g.
# DISTRO=ubuntu
# DIST=trusty
# DIST_UPDATES=trusty-updates # optional
# DIST=jessie
# DIST_UPDATES=jessie-updates # optional
# REPO_EXTRA="universe restricted multiverse" # optional
# APT_REPO=http://archive.ubuntu.com/ubuntu
# KEYRING_FILE=/usr/share/keyrings/ubuntu-archive-keyring.gpg
@ -850,7 +850,7 @@ PrintDistro() {
#@
#@ DumpRelease
#@
#@ Prints disto release. eg: trusty
#@ Prints disto release. eg: jessie
PrintRelease() {
echo ${DIST}
}

Просмотреть файл

@ -28,11 +28,5 @@
"Sha1Sum": "79f2c9fd33caf8c5c90a4621a80c379c747a8f7e",
"SysrootDir": "debian_jessie_mips-sysroot",
"Tarball": "debian_jessie_mips_sysroot.tgz"
},
"trusty_arm": {
"Revision": "501a18940d0a78a40306050946032cbf8f14e7c0",
"Sha1Sum": "b73dd0b9318def5bb9ccdd1d2eafd324797f3048",
"SysrootDir": "ubuntu_trusty_arm-sysroot",
"Tarball": "ubuntu_trusty_arm_sysroot.tgz"
}
}