Commit 3a284371 authored Jan 04, 2021 by Frédéric Pierret Committed by Holger Levsen Jan 18, 2021

presets: disable %clean stage when building RPM



Workaround issue when running with +fileordering on Fedora.
It fails to remove some directories probably seen as still in-use:

+ rm -rf /tmp/reprotest.bJhwNd/const_build_path/rpmbuild/BUILDROOT/qubes-utils-4.1.12-1.fc32.x86_64
rm: cannot remove '/tmp/reprotest.bJhwNd/const_build_path/rpmbuild/BUILDROOT/qubes-utils-4.1.12-1.fc32.x86_64/usr/lib/qubes': Directory not empty
rm: cannot remove '/tmp/reprotest.bJhwNd/const_build_path/rpmbuild/BUILDROOT/qubes-utils-4.1.12-1.fc32.x86_64/usr/lib/debug/.dwz': Directory not empty
error: Bad exit status from /var/tmp/rpm-tmp.pEJpn7 (%clean)

Signed-off-by: Holger Levsen <holger@layer-acht.org>

parent 07bd29ff

reprotest/presets.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,9 @@ def preset_rpm_rpmbuild(fn):
		extra_build_command += ['--define "source_date_epoch_from_changelog Y"']
		extra_build_command += ['--define "clamp_mtime_to_source_date_epoch Y"']
		extra_build_command += ['--define "use_source_date_epoch_as_buildtime Y"']

		# Disable %clean stage: workaround issue when running with +fileordering
		extra_build_command += ['--noclean']
		return PRESET_RPM_DIR.append.build_command(' %s' % ' '.join(extra_build_command))