From a91839eb57103e6fbf5a3f6bacfcc0c471620057 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Thu, 24 Jun 2021 08:08:24 -0500 Subject: [PATCH] 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 Change-Id: I59f4da4b3006302e3598cfa56a0364b052f885ef Reviewed-on: https://review.whamcloud.com/44069 Reviewed-by: James Simmons Reviewed-by: Li Dongyang Reviewed-by: Thomas Stibor Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- autoMakefile.am | 2 ++ debian/{changelog => changelog.in} | 0 2 files changed, 2 insertions(+) rename debian/{changelog => changelog.in} (100%) diff --git a/autoMakefile.am b/autoMakefile.am index 0c2a878..c133f3b 100644 --- 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 -- 1.8.3.1