Skip to content

Commit

Permalink
Remove the Debian stretch sysroot
Browse files Browse the repository at this point in the history
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/950310
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541023}
  • Loading branch information
tanderson-google authored and Commit Bot committed Mar 6, 2018
1 parent 91fcc8e commit 5712cb8
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 2,053 deletions.
Binary file not shown.
7 changes: 3 additions & 4 deletions build/linux/sysroot_scripts/merge-package-lists.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
282 changes: 0 additions & 282 deletions build/linux/sysroot_scripts/packagelist.stretch.amd64

This file was deleted.

279 changes: 0 additions & 279 deletions build/linux/sysroot_scripts/packagelist.stretch.arm

This file was deleted.

280 changes: 0 additions & 280 deletions build/linux/sysroot_scripts/packagelist.stretch.arm64

This file was deleted.

280 changes: 0 additions & 280 deletions build/linux/sysroot_scripts/packagelist.stretch.i386

This file was deleted.

273 changes: 0 additions & 273 deletions build/linux/sysroot_scripts/packagelist.stretch.mips64el

This file was deleted.

273 changes: 0 additions & 273 deletions build/linux/sysroot_scripts/packagelist.stretch.mipsel

This file was deleted.

342 changes: 0 additions & 342 deletions build/linux/sysroot_scripts/sysroot-creator-stretch.sh

This file was deleted.

8 changes: 4 additions & 4 deletions build/linux/sysroot_scripts/sysroot-creator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 5712cb8

Please sign in to comment.