From 017ba12eb099dc858aa63a276ffa09d70ef7fc40 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Tue, 17 Aug 2021 17:27:36 +1200
Subject: [PATCH] Add policycoreutils package mappings for RHEL/Centos 9

Change-Id: I69f0bc39b3ff4759bb66cea76112901ea8afff68
---
 .../redhat-common/package-installs.yaml       |  6 ++--
 .../elements/redhat-common/pkg-map            | 28 ++++++-------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/diskimage_builder/elements/redhat-common/package-installs.yaml b/diskimage_builder/elements/redhat-common/package-installs.yaml
index 7db6deb0..a96b2400 100644
--- a/diskimage_builder/elements/redhat-common/package-installs.yaml
+++ b/diskimage_builder/elements/redhat-common/package-installs.yaml
@@ -11,7 +11,7 @@ ca-certificates:
 # selinux-targeted policy and related tools
 selinux-policy:
 selinux-policy-targeted:
-libselinux-python:
-policycoreutils:
-policycoreutils-python:
+python3-libselinux:
+python3-policycoreutils:
+policycoreutils-python-utils:
 rng-tools:
diff --git a/diskimage_builder/elements/redhat-common/pkg-map b/diskimage_builder/elements/redhat-common/pkg-map
index ea64f4da..6ba11811 100644
--- a/diskimage_builder/elements/redhat-common/pkg-map
+++ b/diskimage_builder/elements/redhat-common/pkg-map
@@ -1,29 +1,17 @@
 {
-  "distro": {
-    "fedora": {
-      "libselinux-python": "python3-libselinux",
-      "policycoreutils": "python3-policycoreutils",
-      "policycoreutils-python": "policycoreutils-python-utils"
-    },
-    "openeuler": {
-      "libselinux-python": "python3-libselinux",
-      "policycoreutils": "python3-policycoreutils",
-      "policycoreutils-python": "policycoreutils-python-utils"
-    }
-  },
   "release": {
     "rhel": {
-      "8": {
-        "libselinux-python": "python3-libselinux",
-        "policycoreutils": "python3-policycoreutils",
-        "policycoreutils-python": "policycoreutils-python-utils"
+      "7": {
+        "python3-libselinux": "libselinux-python",
+        "python3-policycoreutils": "policycoreutils",
+        "policycoreutils-python-utils": "policycoreutils-python"
       }
     },
     "centos": {
-      "8": {
-        "libselinux-python": "python3-libselinux",
-        "policycoreutils": "python3-policycoreutils",
-        "policycoreutils-python": "policycoreutils-python-utils"
+      "7": {
+        "python3-libselinux": "libselinux-python",
+        "python3-policycoreutils": "policycoreutils",
+        "policycoreutils-python-utils": "policycoreutils-python"
       }
     }
   }