Browse code

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 <github@gone.nl>

Sebastiaan van Stijn authored on 2017/03/30 00:45:35
Showing 2 changed files
... ...
@@ -16,6 +16,7 @@ autogen/
16 16
 bundles/
17 17
 cmd/dockerd/dockerd
18 18
 cmd/docker/docker
19
+contrib/builder/rpm/*/changelog
19 20
 dockerversion/version_autogen.go
20 21
 dockerversion/version_autogen_unix.go
21 22
 docs/AWS_S3_BUCKET
... ...
@@ -54,6 +54,7 @@ set -e
54 54
 	make manpages
55 55
 
56 56
 	# Convert the CHANGELOG.md file into RPM changelog format
57
+	rm -f contrib/builder/rpm/${PACKAGE_ARCH}/changelog
57 58
 	VERSION_REGEX="^\W\W (.*) \((.*)\)$"
58 59
 	ENTRY_REGEX="^[-+*] (.*)$"
59 60
 	while read -r line || [[ -n "$line" ]]; do