From 57b7d2bcebd4d2dfd75c85a0f021c46e2b8afff1 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 26 Oct 2021 16:05:57 +1100
Subject: [PATCH] dracut-regenerate: drop Python 2 packages

We don't support any Python 2 guest systems, drop the Python 2 bits
from package-installs.

Change-Id: Ica5c71c2926968d438ac1d0b0f16981cadf0bab1
---
 .../elements/dracut-regenerate/package-installs.yaml         | 5 -----
 diskimage_builder/elements/dracut-regenerate/pkg-map         | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/diskimage_builder/elements/dracut-regenerate/package-installs.yaml b/diskimage_builder/elements/dracut-regenerate/package-installs.yaml
index 9ef4c76c..e00c0cdf 100644
--- a/diskimage_builder/elements/dracut-regenerate/package-installs.yaml
+++ b/diskimage_builder/elements/dracut-regenerate/package-installs.yaml
@@ -1,8 +1,3 @@
-PyYAML:
-  phase: pre-install.d
-  dib_python_version: 2
 python3-PyYAML:
   phase: pre-install.d
-  installtype: package
-  dib_python_version: 3
 
diff --git a/diskimage_builder/elements/dracut-regenerate/pkg-map b/diskimage_builder/elements/dracut-regenerate/pkg-map
index 42164d4f..563138e0 100644
--- a/diskimage_builder/elements/dracut-regenerate/pkg-map
+++ b/diskimage_builder/elements/dracut-regenerate/pkg-map
@@ -1,24 +1,19 @@
 {
   "family": {
     "gentoo": {
-      "PyYAML": "dev-python/pyyaml",
       "python3-PyYAML": "dev-python/pyyaml"
     },
     "suse": {
-      "PyYAML": "python-PyYAML",
       "python3-PyYAML": "python3-PyYAML"
     },
     "redhat": {
-      "PyYAML": "PyYAML",
       "python3-PyYAML": "python3-PyYAML"
     },
     "debian": {
-      "PyYAML": "python-yaml",
       "python3-PyYAML": "python3-yaml"
     }
   },
   "default": {
-    "PyYAML": "",
     "python3-PyYAML": ""
   }
 }