Disable perl_default_subpackage_tests

This could be done in /usr/lib/rpm/macros.d/macros.perl, but redhat
macros can override it thus keeping all custom changes in one place.
We also don't need to rebuild perl again.

We have to disable test suite subpackages in perl packages to avoid
breaking conflict as the feature uses %__spec_check_pre, which is
used by us to disable %check section.

Alternative could be doing this in redhat macros:

%__spec_check_args %{nil}
%__spec_check_post exit 0

We basically remove '-e' from arguments and then at the end do 'exit 0',
but it's no perfect as someone could do 'exit ABC' in %check. We wanted
to completely disable %check section.

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2018-05-23 11:59:32 +02:00
parent 48413fb969
commit a1118c8054
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
2 changed files with 12 additions and 1 deletions

8
macros
View File

@ -259,3 +259,11 @@
# GDB is not yet ported on RISC-V to support Linux targets
%_enable_debug_packages 0
%debug_package %{nil}
# override /usr/lib/rpm/macros.d/macros.perl instead of modifying it in order
# to keep custom changes in one place (and no need to rebuild perl again).
#
# disable perl_default_subpackage_tests, which adds test suite subpackage to
# perl packages. It uses __spec_check_pre for it, which we also use above thus
# causing a breaking conflict.
%perl_default_subpackage_tests %{nil}

View File

@ -7,7 +7,7 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 111
Release: 1.2.riscv64%{?dist}
Release: 1.3.riscv64%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@ -184,6 +184,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
%{_rpmconfigdir}/macros.d/macros.kmp
%changelog
* Wed May 23 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 111-1.3.riscv64
- Disable perl_default_subpackage_tests (test suite subpackage for perl packages)
* Sun May 06 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 111-1.2.riscv64
- Enable annobin for riscv64 (finally built, but untested)