[tor-commits] [tor-browser-build/master] Bug 25394: remove support for unused distributions

[gk at torproject.org]

commit ee58c17648e4c71d799096467ae6b9a617af9f9f
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Mar 2 13:14:26 2018 +0100

    Bug 25394: remove support for unused distributions
    
    Remove support for precise and utopic.
---
 projects/container-image/config   | 23 -----------------------
 projects/debootstrap-image/config | 24 ------------------------
 2 files changed, 47 deletions(-)

diff --git a/projects/container-image/config b/projects/container-image/config
index c9f377f..95d7557 100644
--- a/projects/container-image/config
+++ b/projects/container-image/config
@@ -20,29 +20,6 @@ pre: |
   [% IF pc(c('origin_project'), 'var/pre_pkginst') -%]
   [% pc(c('origin_project'), 'var/pre_pkginst') %]
   [% END -%]
-  [% IF c("var/container/suite") == "precise" -%]
-  export INITRD=no
-  mkdir -p /etc/container_environment
-  echo -n no > /etc/container_environment/INITRD
-  dpkg-divert --local --rename --add /sbin/initctl
-  ln -s /bin/true /sbin/initctl
-  dpkg-divert --local --rename --add /usr/bin/ischroot
-  ln -sf /bin/true /usr/bin/ischroot
-  cat >> /etc/apt/sources.list << EOF
-  deb http://archive.ubuntu.com/ubuntu/ precise-updates main
-  deb-src http://archive.ubuntu.com/ubuntu/ precise-updates main
-
-  deb http://archive.ubuntu.com/ubuntu/ precise universe
-  deb-src http://archive.ubuntu.com/ubuntu/ precise universe
-  deb http://archive.ubuntu.com/ubuntu/ precise-updates universe
-  deb-src http://archive.ubuntu.com/ubuntu/ precise-updates universe
-
-  deb http://archive.ubuntu.com/ubuntu/ precise-security main
-  deb-src http://archive.ubuntu.com/ubuntu/ precise-security main
-  deb http://archive.ubuntu.com/ubuntu/ precise-security universe
-  deb-src http://archive.ubuntu.com/ubuntu/ precise-security universe
-  EOF
-  [% END -%]
   apt-get update -y
   apt-get upgrade -y
   [%
diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index 0b40142..10e2afe 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -44,30 +44,6 @@ targets:
       container:
         suite: buster
         arch: amd64
-  precise-amd64:
-    var:
-      container:
-        suite: precise
-        arch: amd64
-        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
-  precise-i386:
-    var:
-      container:
-        suite: precise
-        arch: i386
-        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
-  utopic-amd64:
-    var:
-      container:
-        suite: utopic
-        arch: amd64
-        debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/
-  utopic-i386:
-    var:
-      container:
-        suite: utopic
-        arch: i386
-        debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/
 
 input_files:
   - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'