From da5c926fe92170446f4f0033f6494fbe2871ec82 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Date: Mon, 11 Sep 2017 14:32:19 +0200 Subject: [PATCH] Add missing package dependency for yaml This element was assuming that yaml was included as package, but there are systems not including it. So properly add yaml as a dependency. Change-Id: I72da2776674a3963657052b9a9715abcb4fab1e2 Partially-Fixes-Bug: #1715686 --- .../dracut-regenerate/package-installs.yaml | 8 +++++++ .../elements/dracut-regenerate/pkg-map | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 diskimage_builder/elements/dracut-regenerate/package-installs.yaml create mode 100644 diskimage_builder/elements/dracut-regenerate/pkg-map diff --git a/diskimage_builder/elements/dracut-regenerate/package-installs.yaml b/diskimage_builder/elements/dracut-regenerate/package-installs.yaml new file mode 100644 index 00000000..9ef4c76c --- /dev/null +++ b/diskimage_builder/elements/dracut-regenerate/package-installs.yaml @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..2249c257 --- /dev/null +++ b/diskimage_builder/elements/dracut-regenerate/pkg-map @@ -0,0 +1,23 @@ +{ + "family": { + "gentoo": { + "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": "" + } +}