From d0a398c167161de4b00177a24c419f6db24c2f4c Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 31 May 2017 16:59:30 +0200
Subject: [PATCH] Adjust package mapping for SUSE family

package-installs.yaml is installing python-dev, not python2-dev,
so we need to adjust the mapping accordingly.

In addition, zypper-minimal used an dpkg specific package name,
while there is a SUSE equivalent (and zypper-minimal is anyway
SUSE family specific)

Change-Id: Ia9dd061fa46a514781808d62e5e93b03f75c6745
---
 diskimage_builder/elements/pip-and-virtualenv/pkg-map         | 4 ++--
 .../elements/zypper-minimal/package-installs.yaml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/diskimage_builder/elements/pip-and-virtualenv/pkg-map b/diskimage_builder/elements/pip-and-virtualenv/pkg-map
index 64619ca9..90694971 100644
--- a/diskimage_builder/elements/pip-and-virtualenv/pkg-map
+++ b/diskimage_builder/elements/pip-and-virtualenv/pkg-map
@@ -10,11 +10,11 @@
     },
     "suse": {
       "python-xml": "python-xml",
-      "python2-dev": "python2-devel",
+      "python-dev": "python2-devel",
       "python3-dev": "python3-devel"
     },
     "redhat": {
-      "python2-dev": "python2-devel",
+      "python-dev": "python2-devel",
       "python3-dev": "python3-devel"
     }
   },
diff --git a/diskimage_builder/elements/zypper-minimal/package-installs.yaml b/diskimage_builder/elements/zypper-minimal/package-installs.yaml
index b80baaef..4aaffdb2 100644
--- a/diskimage_builder/elements/zypper-minimal/package-installs.yaml
+++ b/diskimage_builder/elements/zypper-minimal/package-installs.yaml
@@ -1,5 +1,5 @@
 # kernel
-linux-image-generic:
+kernel-default:
 # And a few useful tools. Some are pulled
 # as dependencies but that may change so lets
 # be explicit.