From f07c46d2c5de753200085535ed11f0f4bffc07e1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 29 Mar 2017 17:45:35 +0200 Subject: [PATCH] delete generated rpm "changelog" The generated "changelog" was not removed before re-generating, causing the changelog to be added twice on repeated runs of "make rpm" (when bind-mounting the local source). As a result, rpms failed to build, because the resulting file had entries in non-chronological order. This change removes the generated file before re-generating, and adds the file to .gitignore, to prevent it from accidentally being added to source control. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 089b71443a0f0428a53c41c71513905f64c22f69 Component: engine --- components/engine/.gitignore | 1 + components/engine/hack/make/build-rpm | 1 + 2 files changed, 2 insertions(+) diff --git a/components/engine/.gitignore b/components/engine/.gitignore index 218339eccd..3e5ed1f82b 100644 --- a/components/engine/.gitignore +++ b/components/engine/.gitignore @@ -16,6 +16,7 @@ autogen/ bundles/ cmd/dockerd/dockerd cmd/docker/docker +contrib/builder/rpm/*/changelog dockerversion/version_autogen.go dockerversion/version_autogen_unix.go docs/AWS_S3_BUCKET diff --git a/components/engine/hack/make/build-rpm b/components/engine/hack/make/build-rpm index eeda82ee61..db0bcf1c17 100644 --- a/components/engine/hack/make/build-rpm +++ b/components/engine/hack/make/build-rpm @@ -54,6 +54,7 @@ set -e make manpages # Convert the CHANGELOG.md file into RPM changelog format + rm -f contrib/builder/rpm/${PACKAGE_ARCH}/changelog VERSION_REGEX="^\W\W (.*) \((.*)\)$" ENTRY_REGEX="^[-+*] (.*)$" while read -r line || [[ -n "$line" ]]; do