Whamcloud - gitweb
LU-14785 build: changelog updates should not dirty version
authorShaun Tancheff <shaun.tancheff@hpe.com>
Mon, 6 Jun 2022 06:15:44 +0000 (23:15 -0700)
committerAndreas Dilger <adilger@whamcloud.com>
Thu, 9 Jun 2022 20:27:42 +0000 (20:27 +0000)
When building lustre debs the final version should not
include 'dirty' due to an update of the changelog

Lustre-change: https://review.whamcloud.com/44069
Lustre-commit: a91839eb57103e6fbf5a3f6bacfcc0c471620057

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/47535
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
autoMakefile.am
debian/changelog.in [moved from debian/changelog with 100% similarity]

index 1325df1..8198ea3 100644 (file)
@@ -240,6 +240,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 \
@@ -347,6 +348,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 \
similarity index 100%
rename from debian/changelog
rename to debian/changelog.in