From 1694f0d9e0b6d65a46acff7a42c46313632a7d18 Mon Sep 17 00:00:00 2001
From: ckonstanski <carlos.konstanski@olo.com>
Date: Sun, 21 Nov 2021 20:28:13 -0700
Subject: a bit of un-bitrotting

---
 bootstrap/run_salt.sh                                   | 17 +----------------
 pillar/gentoo_baseimage/ci.sls                          |  7 -------
 salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile |  4 ++--
 salt/gentoo_baseimage/gentoo_baseimage/files/make.conf  |  2 --
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/bootstrap/run_salt.sh b/bootstrap/run_salt.sh
index 3977e9c..3630405 100755
--- a/bootstrap/run_salt.sh
+++ b/bootstrap/run_salt.sh
@@ -9,26 +9,11 @@ salt_running_p() {
     return ${?}
 }
 
-python3_supported=$(python <<EOF
-try:
-    from salt.scripts import salt_call
-    print("success")
-except ImportError:
-    print("fail")
-EOF
-)
-
-if [ "${python3_supported}" == "success" ]; then
-    python=$(which python)
-else
-    python=$(which python2)
-fi
-
 while salt_running_p; do
     sleep 5
 done
 
-${python} $(which salt-call) \
+python $(which salt-call) \
     --local \
     --pillar-root=${working_dir}/pillar \
     --file-root=${working_dir}/salt \
diff --git a/pillar/gentoo_baseimage/ci.sls b/pillar/gentoo_baseimage/ci.sls
index 2a01969..eb74df6 100644
--- a/pillar/gentoo_baseimage/ci.sls
+++ b/pillar/gentoo_baseimage/ci.sls
@@ -12,10 +12,3 @@ ci:
       mode: "0755"
       is_template: True
       relative_to_buildroot: True
-    cloudcfg_sh:
-      name: cloudcfg.sh
-      path: .
-      source: cloudcfg.sh
-      mode: "0755"
-      is_template: False
-      relative_to_buildroot: True
diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile b/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile
index 67c9f23..3f833dc 100644
--- a/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile
+++ b/salt/gentoo_baseimage/gentoo_baseimage/files/Dockerfile
@@ -1,5 +1,5 @@
-FROM gentoo/stage3-amd64
-MAINTAINER Carlos Konstanski <carlos.konstanski@verizonwireless.com>
+FROM gentoo/stage3
+MAINTAINER Carlos Konstanski <me@ckons.org>
 ADD docker-start.tar.xz /
 RUN /installdeps.sh
 ENTRYPOINT [ "/bin/bash" ]
diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf
index b06fde6..a9234de 100644
--- a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf
+++ b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf
@@ -4,8 +4,6 @@ CXXFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 USE="cacert -X -webstart -alsa -cups -gtk -vala -introspection"
-PYTHON_TARGETS="python2_7 python3_6 python3_7 python3_8"
-PYTHON_SINGLE_TARGET="python3_7"
 CURL_SSL="openssl"
 GRUB_PLATFORMS="pc"
 ABI_X86="64 32"
-- 
cgit v1.3