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>
This commit is contained in:
parent
bce494f7a2
commit
089b71443a
|
@ -16,6 +16,7 @@ autogen/
|
||||||
bundles/
|
bundles/
|
||||||
cmd/dockerd/dockerd
|
cmd/dockerd/dockerd
|
||||||
cmd/docker/docker
|
cmd/docker/docker
|
||||||
|
contrib/builder/rpm/*/changelog
|
||||||
dockerversion/version_autogen.go
|
dockerversion/version_autogen.go
|
||||||
dockerversion/version_autogen_unix.go
|
dockerversion/version_autogen_unix.go
|
||||||
docs/AWS_S3_BUCKET
|
docs/AWS_S3_BUCKET
|
||||||
|
|
|
@ -54,6 +54,7 @@ set -e
|
||||||
make manpages
|
make manpages
|
||||||
|
|
||||||
# Convert the CHANGELOG.md file into RPM changelog format
|
# Convert the CHANGELOG.md file into RPM changelog format
|
||||||
|
rm -f contrib/builder/rpm/${PACKAGE_ARCH}/changelog
|
||||||
VERSION_REGEX="^\W\W (.*) \((.*)\)$"
|
VERSION_REGEX="^\W\W (.*) \((.*)\)$"
|
||||||
ENTRY_REGEX="^[-+*] (.*)$"
|
ENTRY_REGEX="^[-+*] (.*)$"
|
||||||
while read -r line || [[ -n "$line" ]]; do
|
while read -r line || [[ -n "$line" ]]; do
|
||||||
|
|
Loading…
Reference in New Issue