From Dan Kenigsberg <[email protected]>:
Dan Kenigsberg has submitted this change and it was merged. (
https://gerrit.ovirt.org/79925 )
Change subject: build: remove constants.py from dist package
......................................................................
build: remove constants.py from dist package
Recently constants.py was moved to lib/vdsm/common. This was done by
commit f63269e9fa2b1a31e6d9673f8e3337eeacbd0332. However, because of
existing rule in Makefile.am this file was mistakenly included into
dist package. As a result constants.py was not recreated during RPM
builds which resulted in broken RPMs (constants.py contained invalid
paths).
lib/vdsm/common/Makefile.am contained dist_* rule that includes all
'*.py' into dist package. Note that files listed in the nodist_* rule
are not taken into account during 'make dist'.
This change does two things:
1) it modifies the dist_* rule to contain all '*.py' minus the files
listed in nodist_* rule
2) test is added to check-patch.sh to make sure no file generated from
.in file is included in the dist package
ad 2) There are several exceptions that we seem to include in dist
package on purpose. I don't really believe that including any of those
files (except maybe vdsm.spec) is necessary, but I did not investigate.
This can be improved in subsequent patches.
Change-Id: I36820d3c458c5d162dcb8fbe2baf1c9647c9032d
Signed-off-by: Tomáš Golembiovský <[email protected]>
---
M automation/check-patch.sh
M lib/vdsm/common/Makefile.am
2 files changed, 44 insertions(+), 1 deletion(-)
Approvals:
Jenkins CI: Passed CI tests
Francesco Romani: Looks good to me, approved
Tomas Golembiovsky: Verified
--
To view, visit https://gerrit.ovirt.org/79925
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36820d3c458c5d162dcb8fbe2baf1c9647c9032d
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tomas Golembiovsky <[email protected]>
Gerrit-Reviewer: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Edward Haas <[email protected]>
Gerrit-Reviewer: Francesco Romani <[email protected]>
Gerrit-Reviewer: Irit Goihman <[email protected]>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tomas Golembiovsky <[email protected]>
Gerrit-Reviewer: Yaniv Bronhaim <[email protected]>
Gerrit-Reviewer: gerrit-hooks <[email protected]>
_______________________________________________
vdsm-patches mailing list -- [email protected]
To unsubscribe send an email to [email protected]