LU-14785 build: changelog updates should not dirty version

When building lustre debs the final version should not
include 'dirty' due to an update of the changelog

HPE-bug-id: LUS-10152
Test-Parameters: trivial
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I59f4da4b3006302e3598cfa56a0364b052f885ef
Reviewed-on: https://review.whamcloud.com/44069
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Thomas Stibor <thomas@stibor.net>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/autoMakefile.am b/autoMakefile.am
index 0c2a878..c133f3b 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -234,6 +234,7 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
 # In the debs target, first make sure what's in the changelog reflects
 # the software version.
 debs: undef.h
+       cp -v debian/changelog.in debian/changelog ; \
        lversion=$$(echo @VERSION@ | tr '_' '-'); \
        cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
        if [ "$$lversion" != "$$cversion" ]; then \
@@ -338,6 +339,7 @@ debs: undef.h
           debs/
 
 dkms-debs: undef.h
+       cp -v debian/changelog.in debian/changelog ; \
        lversion=$$(echo @VERSION@ | tr '_' '-'); \
        cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
        if [ "$$lversion" != "$$cversion" ]; then \

diff --git a/debian/changelog b/debian/changelog.in
similarity index 100%
rename from debian/changelog
rename to debian/changelog.in