[lmi-commits] [lmi] master 9257bfe1 3/3: Create only single-architecture chroots henceforth

[Greg Chicares]

branch: master
commit 9257bfe1f9cbbbce891c49734dfd1086fa62d29b
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Create only single-architecture chroots henceforth
    
    '--add-architecture i386' has served lmi well, but it makes chroots
    much larger, and updating them much slower.
---
 lmi_setup_20.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lmi_setup_20.sh b/lmi_setup_20.sh
index d6da2f88..c1cd4c1c 100755
--- a/lmi_setup_20.sh
+++ b/lmi_setup_20.sh
@@ -30,10 +30,6 @@ set -evx
 assert_su
 assert_chrooted
 
-# Add i386 before installing wine, so that wine can run 32-bit .exe's .
-
-dpkg --add-architecture i386
-
 # Prevent daemons from starting in the chroot; work around an
 # 'ischroot' defect. See:
 #   https://wiki.debian.org/chroot#Configuration
@@ -66,8 +62,7 @@ sed -e'/^[^#]/s/^/# SUPPRESSED # /' -i /etc/skel/.bash_logout
 # redhat names some packages differently:
 #   pkgconfig ShellCheck libxml2 libxslt
 #   vim-X11 vim-common vim-enhanced vim-minimal
-#   mingw32-gcc-c++ mingw64-gcc-c++
-#   java-1.8.0-openjdk
+#   mingw64-gcc-c++ java-1.8.0-openjdk
 # It provides 'xsltproc' as part of libxslt, though not as a
 # separate package:
 #   https://bugzilla.redhat.com/show_bug.cgi?id=965996