[elbe-devel] [PATCH v2 1/3] schema: Drop stretch as valid initvm suite

[Bastian Germann]

stretch initvm creation is not possible since dropping Python 2
support if you do not provide an extra repo with python3-spyne.
Also, end of June marks the end of stretch's LTS life.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/commands/init.py   | 15 ++-------------
 elbepack/init/Makefile.mako |  8 --------
 schema/dbsfed.xsd           |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
index 0e78d83d43..a39db3cfcb 100644
--- a/elbepack/commands/init.py
+++ b/elbepack/commands/init.py
@@ -20,7 +20,7 @@ from elbepack.version import elbe_version
 from elbepack.templates import write_template, get_initvm_preseed
 from elbepack.directories import init_template_dir, elbe_dir
 from elbepack.config import cfg
-from elbepack.shellhelper import command_out, system, do, system_out
+from elbepack.shellhelper import system, do, system_out
 from elbepack.log import elbe_logging
 from elbepack.filesystem import Filesystem
 
@@ -137,17 +137,6 @@ def run_command(argv):
             cdrom = mirror.ensure_child("cdrom")
             cdrom.set_text(os.path.abspath(opt.cdrom))
 
-        # this is a workaround for
-        # http://lists.linutronix.de/pipermail/elbe-devel/2017-July/000541.html
-        _, virt = command_out('test -x /usr/bin/systemd-detect-virt && '
-                              '/usr/bin/systemd-detect-virt')
-        _, dist = command_out('lsb_release -cs')
-
-        if 'vmware' in virt and 'stretch' in dist:
-            machine_type = 'pc-i440fx-2.6'
-        else:
-            machine_type = 'pc'
-
         try:
             os.makedirs(opt.directory)
         except OSError as e:
@@ -175,7 +164,7 @@ def run_command(argv):
              "http_proxy": initvm_http_proxy,
              "pkgs": xml.node("/initvm/pkg-list") or [],
              "preseed": get_initvm_preseed(xml),
-             "machine_type": machine_type,
+             "machine_type": "pc",
              "cfg": cfg}
 
         if http_proxy != "":
diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
index ad69450702..779ba23c26 100644
--- a/elbepack/init/Makefile.mako
+++ b/elbepack/init/Makefile.mako
@@ -19,15 +19,7 @@ INTERPRETER?=${prj.text('interpreter', default=defs, key='interpreter')}
 % if defs["interpreter-args"] is not None:
 INTERPRETER-ARGS= ${" ".join(defs["interpreter-args"])}
 % endif
-# this is a workaround for
-# http://lists.linutronix.de/pipermail/elbe-devel/2017-July/000541.html
-VIRT=$(shell test -x /usr/bin/systemd-detect-virt && /usr/bin/systemd-detect-virt)
-DIST=$(shell lsb_release -cs)
-ifeq ($(filter-out vmware stretch, $(VIRT) $(DIST)),)
-MACHINE?=pc-i440fx-2.6
-else
 MACHINE?=pc
-endif
 
 CONSOLE?=ttyS0,115200n1
 LOOP_OFFSET?=1048576
diff --git a/schema/dbsfed.xsd b/schema/dbsfed.xsd
index abd62db6cd..38642e3ac2 100644
--- a/schema/dbsfed.xsd
+++ b/schema/dbsfed.xsd
@@ -671,7 +671,6 @@
       <enumeration value="sid" />
       <enumeration value="bullseye" />
       <enumeration value="buster" />
-      <enumeration value="stretch" />
     </restriction>
   </simpleType>
 
-- 
2.30.2