Merge "Adjust package mapping for SUSE family"

2017-06-02 02:56:16 +00:00 · 2017-06-02 02:56:16 +00:00 · 80cc1d0ea4
commit 80cc1d0ea4
parent f58bf252de d0a398c167
2 changed files with 3 additions and 3 deletions
--- 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"
    }
  },
--- 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.