rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Move the remaining dependency generator stuff to the kmp macro package

Browse Source 
- Stop overriding rpm external dependency generator settings by default
- No normal package should ever end up using the old unmaintained
  dependency generator scripts from here, but the kmp system depends
  for now on the way this was previously set up here so letting
  that old cruft live in the non-default package for now.
This commit is contained in:
Panu Matilainen 2014-04-08 12:36:08 +03:00
parent fdc99f0414
commit c8cbd244cf
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros
View File

@ -175,9 +175,6 @@ package or when debugging this package.\
# Use XZ compression for binary payloads # Use XZ compression for binary payloads
%_binary_payload w2.xzdio %_binary_payload w2.xzdio
%__find_provides /usr/lib/rpm/redhat/find-provides
%__find_requires /usr/lib/rpm/redhat/find-requires
%_hardening_cflags -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 %_hardening_cflags -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
# we don't escape symbols '~', '"', etc. so be careful when changing this # we don't escape symbols '~', '"', etc. so be careful when changing this
%_hardening_ldflags -specs=/usr/lib/rpm/redhat/redhat-hardened-ld %_hardening_ldflags -specs=/usr/lib/rpm/redhat/redhat-hardened-ld

3
macros.kmp
View File

@ -2,6 +2,9 @@
redhat_kernel_module_package 1 redhat_kernel_module_package 1
kernel_module_package_release 1 kernel_module_package_release 1
%__find_provides /usr/lib/rpm/redhat/find-provides
%__find_requires /usr/lib/rpm/redhat/find-requires
#kernel_module_package [ -n name ] [ -v version ] [ -r release ] [ -s script ] #kernel_module_package [ -n name ] [ -v version ] [ -r release ] [ -s script ]
# [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ... # [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ...

20
redhat-rpm-config.spec
View File

@ -83,7 +83,7 @@ Red Hat specific rpm configuration files.
%package -n kernel-rpm-macros %package -n kernel-rpm-macros
Summary: Macros and scripts for building kernel module packages. Summary: Macros and scripts for building kernel module packages.
Requires: redhat-rpm-config >= 12 Requires: redhat-rpm-config >= 13
%description -n kernel-rpm-macros %description -n kernel-rpm-macros
Macros and scripts for building kernel module packages. Macros and scripts for building kernel module packages.
@ -112,26 +112,26 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir %{rrcdir} %dir %{rrcdir}
%dir %{rrcdir}/find-provides.d
%{rrcdir}/macros %{rrcdir}/macros
%{rrcdir}/rpmrc %{rrcdir}/rpmrc
%{rrcdir}/brp-* %{rrcdir}/brp-*
%{rrcdir}/dist.sh %{rrcdir}/dist.sh
%{rrcdir}/find-provides
%{rrcdir}/find-provides.libtool
%{rrcdir}/find-provides.pkgconfig
%{rrcdir}/find-requires
%{rrcdir}/find-requires.libtool
%{rrcdir}/find-requires.pkgconfig
%{rrcdir}/redhat-hardened-* %{rrcdir}/redhat-hardened-*
%{rrcdir}/config.* %{rrcdir}/config.*
%{_rpmconfigdir}/macros.d/macros.*-srpm %{_rpmconfigdir}/macros.d/macros.*-srpm
%{_rpmconfigdir}/macros.d/macros.dwz %{_rpmconfigdir}/macros.d/macros.dwz
%files -n kernel-rpm-macros %files -n kernel-rpm-macros
%dir %{rrcdir}/find-provides.d
%{rrcdir}/kmodtool %{rrcdir}/kmodtool
%{rrcdir}/rpmsort %{rrcdir}/rpmsort
%{rrcdir}/symset-table %{rrcdir}/symset-table
%{rrcdir}/find-provides
%{rrcdir}/find-provides.libtool
%{rrcdir}/find-provides.pkgconfig
%{rrcdir}/find-requires
%{rrcdir}/find-requires.libtool
%{rrcdir}/find-requires.pkgconfig
%{rrcdir}/find-provides.ksyms %{rrcdir}/find-provides.ksyms
%{rrcdir}/find-requires.ksyms %{rrcdir}/find-requires.ksyms
%{rrcdir}/find-provides.d/firmware.prov %{rrcdir}/find-provides.d/firmware.prov
@ -139,6 +139,10 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
%{_rpmconfigdir}/macros.d/macros.kmp %{_rpmconfigdir}/macros.d/macros.kmp
%changelog %changelog
* Tue Apr 08 2014 Panu Matilainen <pmatilai@redhat.com> - 13-1
- Move the remaining dependency generator stuff to the kmp macro package
- Stop overriding rpm external dependency generator settings by default
* Mon Apr 07 2014 Panu Matilainen <pmatilai@redhat.com> - 12-1 * Mon Apr 07 2014 Panu Matilainen <pmatilai@redhat.com> - 12-1
- Be more explicit about the package contents - Be more explicit about the package contents
- Split kernel module macros to a separate file - Split kernel module macros to a separate file