From f09324461101765c81111e5315bfc87f497b6e0a Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 19 Aug 2020 19:22:05 +0000 Subject: [PATCH] Revert "source-repositories: git is a build-only dependency" This breaks having git as a package-install in other elements. And results in diskimage-builder always erasing git on the image. This reverts commit 3c650255590d7dcded8699cd01e198f6ce4c6c8e. Change-Id: Ifb18c4243aa08055d98602aa4fdb30b16dae061d --- .../elements/source-repositories/package-installs.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/diskimage_builder/elements/source-repositories/package-installs.yaml b/diskimage_builder/elements/source-repositories/package-installs.yaml index 74cdfed9..0f115f0f 100644 --- a/diskimage_builder/elements/source-repositories/package-installs.yaml +++ b/diskimage_builder/elements/source-repositories/package-installs.yaml @@ -1,4 +1,5 @@ # Git isn't a dependency of this element, but is a dependency of pbr -# if you are doing pip install on a git cloned directory +# if you are doing pip install on a git cloned directory, because this +# looks to be a fairly common pattern it makes sense to have git on the +# target image git: - build-only: True