From 77fac28078fba780b161ffc9468cbd23755cd07d Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 17 Sep 2020 14:39:55 +0200 Subject: [PATCH] Rename duplicating 10-debian-minimal.bash This file is present in both dpkg and debian-minimal element, causing a failure to build anything with debian. Change-Id: I8213d581a79bb432281f31955a44418e4047d9e1 --- .../environment.d/{10-debian-minimal.bash => 10-dpkg.bash} | 0 .../notes/debian-minimal-confilicts-c139ab0c98e5762f.yaml | 4 ++++ 2 files changed, 4 insertions(+) rename diskimage_builder/elements/dpkg/environment.d/{10-debian-minimal.bash => 10-dpkg.bash} (100%) create mode 100644 releasenotes/notes/debian-minimal-confilicts-c139ab0c98e5762f.yaml diff --git a/diskimage_builder/elements/dpkg/environment.d/10-debian-minimal.bash b/diskimage_builder/elements/dpkg/environment.d/10-dpkg.bash similarity index 100% rename from diskimage_builder/elements/dpkg/environment.d/10-debian-minimal.bash rename to diskimage_builder/elements/dpkg/environment.d/10-dpkg.bash diff --git a/releasenotes/notes/debian-minimal-confilicts-c139ab0c98e5762f.yaml b/releasenotes/notes/debian-minimal-confilicts-c139ab0c98e5762f.yaml new file mode 100644 index 000000000..7e91529da --- /dev/null +++ b/releasenotes/notes/debian-minimal-confilicts-c139ab0c98e5762f.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixes an issue with duplicate element files building Debian images.