Bug 30285

Summary:	tarballs for dbus-1.4.0 contains uncorrect pre-generated files
Product:	dbus	Reporter:	Peter Hjalmarsson <xake>
Component:	core	Assignee:	Simon McVittie <smcv>
Status:	RESOLVED FIXED	QA Contact:	John (J5) Palmieri <johnp>
Severity:	normal
Priority:	medium	CC:	hp
Version:	1.4.x	Keywords:	patch
Hardware:	Other
OS:	All
URL:	http://git.collabora.co.uk/?p=user/smcv/dbus-smcv.git;a=shortlog;h=refs/heads/dist-30285
See Also:	https://bugs.gentoo.org/show_bug.cgi?id=337989
Whiteboard:
i915 platform:		i915 features:
Attachments:	Don't distribute generated files that embed our builddir Ignore files produced by `make dist`

Description Peter Hjalmarsson 2010-09-20 09:43:24 UTC

Inside of the tarball for dbus-1.4.0 there are some files, namely:

test/data/valid-service-files/org.freedesktop.DBus.TestSuite.PrivServer.service
test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service
test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service
test/data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service
test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service
test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service
test/data/valid-config-files/debug-allow-all-sha1.conf
test/data/valid-config-files/debug-allow-all.conf


These are generated during configure, but since they already exists configure fails to regenerate those.
This leaves the user with a "make check" trying to find files in /home/lennart/git/dbus/ instead of in the current source-tree and when it fails to find those files the tests fails. Removing those files and configure will succesfully generate those files with the correct path and make check will pass.

Please make sure that make dist-* does not add those files to the tarball (or how you generate the tarball).

Comment 1 Simon McVittie 2011-01-21 08:11:29 UTC

In a test build, the following distributed files incorrectly embed my build directory:

./test/name-test/run-with-tmp-session-bus.conf
./test/data/valid-config-files/debug-allow-all.conf
./test/data/valid-config-files/debug-allow-all-sha1.conf
./test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service
./test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service
./test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service
./test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service
./test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service
./test/data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service
./test/data/valid-service-files/org.freedesktop.DBus.TestSuite.PrivServer.service
./test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service
./test/data/valid-config-files-system/debug-allow-all-fail.conf
./test/data/valid-config-files-system/debug-allow-all-pass.conf
./test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service
./test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service
./test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service
./test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service

I think the culprit is the dist-hook rule in test/Makefile.am.

Comment 2 Simon McVittie 2011-02-01 10:05:31 UTC

Created attachment 42815 [details] [review]
Don't distribute generated files that embed our builddir

Comment 3 Simon McVittie 2011-02-01 10:06:02 UTC

Created attachment 42816 [details] [review]
Ignore files produced by `make dist`

Comment 4 Simon McVittie 2011-02-01 10:07:11 UTC

IMO this should be considered a release blocker, if it causes build failures on some platforms (which it clearly does, judging by the Gentoo bug).

Comment 5 Will Thompson 2011-02-02 06:42:47 UTC

Review of attachment 42815 [details] [review]:

This hook seems kind of crufty in general. I guess replacing it with an explicit EXTRA_DIST list would not be trivial?

Comment 6 Will Thompson 2011-02-02 06:43:21 UTC

Review of attachment 42816 [details] [review]:

Looks fine, ship it.

Comment 7 Simon McVittie 2011-02-02 07:19:09 UTC

Fixed in git for 1.4.4, 1.5.0. Thanks!

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.