Remove the Debian stretch sysroot

The sid sysroot change seems to have stuck.  Now remove the stretch sysroot so
we don't have to maintain both of them.

R=thestig

Change-Id: I5ae295143a3ca2db70299ea0773fd316ff04ac48
Reviewed-on: https://chromium-review.googlesource.com/950310Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541023}

build/linux/sysroot_scripts/merge-package-lists.py

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

build/linux/sysroot_scripts/sysroot-creator-stretch.sh

-#!/bin/bash
-# Copyright 2017 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=debian
-DIST=stretch
-
-APT_SOURCES_LIST="\
-http://ftp.us.debian.org/debian/ stretch main
-http://security.debian.org/ stretch/updates main
-http://ftp.us.debian.org/debian/ stretch-updates main"
-
-# gpg keyring file generated using:
-#   export KEYS="518E17E1 46925553 2B90D010 C857C906 F66AEC98 8AE22BA9 1A7B6500"
-#   gpg --recv-keys $KEYS
-#   gpg --output ./debian-archive-stretch-stable.gpg --export $KEYS
-KEYRING_FILE="${SCRIPT_DIR}/debian-archive-stretch-stable.gpg"
-
-HAS_ARCH_AMD64=1
-HAS_ARCH_I386=1
-HAS_ARCH_ARM=1
-HAS_ARCH_ARM64=1
-HAS_ARCH_MIPS=1
-HAS_ARCH_MIPS64EL=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
-  krb5-multidev
-  libappindicator-dev
-  libappindicator1
-  libappindicator3-1
-  libappindicator3-dev
-  libasound2
-  libasound2-dev
-  libasyncns0
-  libatk-bridge2.0-0
-  libatk-bridge2.0-dev
-  libatk1.0-0
-  libatk1.0-dev
-  libatomic1
-  libatspi2.0-0
-  libatspi2.0-dev
-  libattr1
-  libaudit1
-  libavahi-client3
-  libavahi-common3
-  libblkid1
-  libbluetooth-dev
-  libbluetooth3
-  libbrlapi-dev
-  libbrlapi0.6
-  libbsd0
-  libc6
-  libc6-dev
-  libcairo-gobject2
-  libcairo-script-interpreter2
-  libcairo2
-  libcairo2-dev
-  libcap-dev
-  libcap-ng0
-  libcap2
-  libcolord2
-  libcomerr2
-  libcups2
-  libcups2-dev
-  libcupsimage2
-  libcupsimage2-dev
-  libdatrie1
-  libdb5.3
-  libdbus-1-3
-  libdbus-1-dev
-  libdbus-glib-1-2
-  libdbusmenu-glib-dev
-  libdbusmenu-glib4
-  libdbusmenu-gtk3-4
-  libdbusmenu-gtk4
-  libdrm-amdgpu1
-  libdrm-dev
-  libdrm-nouveau2
-  libdrm-radeon1
-  libdrm2
-  libegl1-mesa
-  libegl1-mesa-dev
-  libelf-dev
-  libelf1
-  libepoxy-dev
-  libepoxy0
-  libexpat1
-  libexpat1-dev
-  libffi-dev
-  libffi6
-  libflac8
-  libfontconfig1
-  libfontconfig1-dev
-  libfreetype6
-  libfreetype6-dev
-  libgbm-dev
-  libgbm1
-  libgcc-6-dev
-  libgcc1
-  libgcrypt20
-  libgcrypt20-dev
-  libgdk-pixbuf2.0-0
-  libgdk-pixbuf2.0-dev
-  libgl1-mesa-dev
-  libgl1-mesa-glx
-  libglapi-mesa
-  libglib2.0-0
-  libglib2.0-dev
-  libgmp10
-  libgnome-keyring-dev
-  libgnome-keyring0
-  libgnutls-dane0
-  libgnutls-openssl27
-  libgnutls28-dev
-  libgnutls30
-  libgnutlsxx28
-  libgomp1
-  libgpg-error-dev
-  libgpg-error0
-  libgraphite2-3
-  libgraphite2-dev
-  libgssapi-krb5-2
-  libgssrpc4
-  libgtk-3-0
-  libgtk-3-dev
-  libgtk2.0-0
-  libgtk2.0-dev
-  libharfbuzz-dev
-  libharfbuzz-gobject0
-  libharfbuzz-icu0
-  libharfbuzz0b
-  libhogweed4
-  libice6
-  libicu57
-  libidl-2-0
-  libidn11
-  libindicator3-7
-  libindicator7
-  libjbig0
-  libjpeg62-turbo
-  libjson-glib-1.0-0
-  libjsoncpp-dev
-  libjsoncpp1
-  libk5crypto3
-  libkadm5clnt-mit11
-  libkadm5srv-mit11
-  libkdb5-8
-  libkeyutils1
-  libkrb5-3
-  libkrb5-dev
-  libkrb5support0
-  liblcms2-2
-  libltdl7
-  liblz4-1
-  liblzma5
-  liblzo2-2
-  libmount1
-  libnettle6
-  libnspr4
-  libnspr4-dev
-  libnss-db
-  libnss3
-  libnss3-dev
-  libogg0
-  liborbit-2-0
-  liborbit2
-  libp11-2
-  libp11-kit0
-  libpam0g
-  libpam0g-dev
-  libpango-1.0-0
-  libpango1.0-dev
-  libpangocairo-1.0-0
-  libpangoft2-1.0-0
-  libpangox-1.0-0
-  libpangoxft-1.0-0
-  libpci-dev
-  libpci3
-  libpciaccess0
-  libpcre16-3
-  libpcre3
-  libpcre3-dev
-  libpcre32-3
-  libpcrecpp0v5
-  libpixman-1-0
-  libpixman-1-dev
-  libpng-dev
-  libpng16-16
-  libpthread-stubs0-dev
-  libpulse-dev
-  libpulse-mainloop-glib0
-  libpulse0
-  librest-0.7-0
-  libselinux1
-  libsm6
-  libsndfile1
-  libsoup-gnome2.4-1
-  libsoup2.4-1
-  libspeechd-dev
-  libspeechd2
-  libsqlite3-0
-  libssl-dev
-  libssl1.0.2
-  libssl1.1
-  libstdc++-6-dev
-  libstdc++6
-  libsystemd0
-  libtasn1-6
-  libthai0
-  libtiff5
-  libudev-dev
-  libudev1
-  libunbound2
-  libuuid1
-  libva-dev
-  libva-drm1
-  libva-egl1
-  libva-glx1
-  libva-tpi1
-  libva-wayland1
-  libva-x11-1
-  libva1
-  libvorbis0a
-  libvorbisenc2
-  libwayland-client0
-  libwayland-cursor0
-  libwayland-dev
-  libwayland-egl1-mesa
-  libwayland-server0
-  libwrap0
-  libx11-6
-  libx11-dev
-  libx11-xcb-dev
-  libx11-xcb1
-  libxau-dev
-  libxau6
-  libxcb-dri2-0
-  libxcb-dri3-0
-  libxcb-glx0
-  libxcb-present0
-  libxcb-render0
-  libxcb-render0-dev
-  libxcb-shm0
-  libxcb-shm0-dev
-  libxcb-sync1
-  libxcb-xfixes0
-  libxcb1
-  libxcb1-dev
-  libxcomposite-dev
-  libxcomposite1
-  libxcursor-dev
-  libxcursor1
-  libxdamage-dev
-  libxdamage1
-  libxdmcp-dev
-  libxdmcp6
-  libxext-dev
-  libxext6
-  libxfixes-dev
-  libxfixes3
-  libxft2
-  libxi-dev
-  libxi6
-  libxinerama-dev
-  libxinerama1
-  libxkbcommon-dev
-  libxkbcommon0
-  libxml2
-  libxrandr-dev
-  libxrandr2
-  libxrender-dev
-  libxrender1
-  libxshmfence1
-  libxss-dev
-  libxss1
-  libxt-dev
-  libxt6
-  libxtst-dev
-  libxtst6
-  libxxf86vm1
-  linux-libc-dev
-  mesa-common-dev
-  speech-dispatcher
-  wayland-protocols
-  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
-  x11proto-xinerama-dev
-  zlib1g
-  zlib1g-dev
-"
-
-DEBIAN_PACKAGES_AMD64="
-  liblsan0
-  libtsan0
-"
-
-DEBIAN_PACKAGES_X86="
-  libasan3
-  libcilkrts5
-  libdrm-intel1
-  libitm1
-  libmpx2
-  libquadmath0
-  libubsan0
-"
-
-DEBIAN_PACKAGES_ARM="
-  libasan3
-  libdrm-exynos1
-  libdrm-freedreno1
-  libdrm-omap1
-  libdrm-tegra0
-  libubsan0
-"
-
-DEBIAN_PACKAGES_ARM64="
-  libasan3
-  libdrm-freedreno1
-  libdrm-tegra0
-  libgmp10
-  libitm1
-  libthai0
-  libubsan0
-"
-
-. "${SCRIPT_DIR}/sysroot-creator.sh"

build/linux/sysroot_scripts/sysroot-creator.sh

@@ -3,13 +3,13 @@
 # found in the LICENSE file.
 #
 # This script should not be run directly but sourced by the other
-# scripts (e.g. sysroot-creator-stretch.sh).  Its up to the parent scripts
+# scripts (e.g. sysroot-creator-sid.sh).  Its up to the parent scripts
 # to define certain environment variables: e.g.
 #  DISTRO=debian
-#  DIST=stretch
+#  DIST=sid
 #  # Similar in syntax to /etc/apt/sources.list
-#  APT_SOURCES_LIST="http://ftp.us.debian.org/debian/ stretch main"
-#  KEYRING_FILE=debian-archive-stretch-stable.gpg
+#  APT_SOURCES_LIST="http://ftp.us.debian.org/debian/ sid main"
+#  KEYRING_FILE=debian-archive-sid-stable.gpg
 #  DEBIAN_PACKAGES="gcc libz libssl"
 
 #@ This script builds Debian/Ubuntu sysroot images for building Google Chrome.

build/linux/sysroot_scripts/sysroots.json

@@ -34,41 +34,5 @@
         "Sha1Sum": "f90c3b81485ffebb283afddb1a72bc61e14c593d",
         "SysrootDir": "debian_sid_mips64el-sysroot",
         "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
-    },
-    "stretch_amd64": {
-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-        "Sha1Sum": "a668aafe335848c6e4aed11d0b32ea2d5c5a124d",
-        "SysrootDir": "debian_stretch_amd64-sysroot",
-        "Tarball": "debian_stretch_amd64_sysroot.tar.xz"
-    },
-    "stretch_arm": {
-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-        "Sha1Sum": "4658f558326d93d8a69fe6940bc19cf7de32cf4d",
-        "SysrootDir": "debian_stretch_arm-sysroot",
-        "Tarball": "debian_stretch_arm_sysroot.tar.xz"
-    },
-    "stretch_arm64": {
-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-        "Sha1Sum": "a3c530ff8a5d9be34dd6fc07a05188ea947116cf",
-        "SysrootDir": "debian_stretch_arm64-sysroot",
-        "Tarball": "debian_stretch_arm64_sysroot.tar.xz"
-    },
-    "stretch_i386": {
-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-        "Sha1Sum": "98425d632814b45289ca6c3acb38d8e11c487ec6",
-        "SysrootDir": "debian_stretch_i386-sysroot",
-        "Tarball": "debian_stretch_i386_sysroot.tar.xz"
-    },
-    "stretch_mips": {
-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-        "Sha1Sum": "dcb078646b49c94298cf702acc5ece28a689fea4",
-        "SysrootDir": "debian_stretch_mips-sysroot",
-        "Tarball": "debian_stretch_mips_sysroot.tar.xz"
-    },
-    "stretch_mips64el": {
-        "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
-        "Sha1Sum": "a68c72c6b6d4fad8d43e268cc081ce6afeaa79e4",
-        "SysrootDir": "debian_stretch_mips64el-sysroot",
-        "Tarball": "debian_stretch_mips64el_sysroot.tar.xz"
     }
 }