rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Wrap doc BR in with_doc

Browse Source 
- Stop building perf in build AND install because that's stupid
- Use prebuilt perf man pages
This commit is contained in:
Josh Boyer 2013-12-14 09:52:27 -05:00
parent 54dc996fcb
commit ed7ef34541
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ clog
*.rpm *.rpm
*.orig *.orig
kernel-[23].*/ kernel-[23].*/
/perf-man.tar.gz

20
kernel.spec
View File

@ -488,12 +488,14 @@ BuildRequires: kmod, patch, bash, sh-utils, tar
BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, make, diffutils, gawk BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, make, diffutils, gawk
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc
BuildRequires: net-tools, hostname, bc BuildRequires: net-tools, hostname, bc
%if %{with_doc}
BuildRequires: xmlto, asciidoc BuildRequires: xmlto, asciidoc
%endif
%if %{with_sparse} %if %{with_sparse}
BuildRequires: sparse BuildRequires: sparse
%endif %endif
%if %{with_perf} %if %{with_perf}
BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex
BuildRequires: audit-libs-devel BuildRequires: audit-libs-devel
%endif %endif
%if %{with_tools} %if %{with_tools}
@ -517,6 +519,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-%{kversion}.tar.xz Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-%{kversion}.tar.xz
Source10: perf-man.tar.gz
Source11: x509.genkey Source11: x509.genkey
Source15: merge.pl Source15: merge.pl
@ -1747,8 +1750,7 @@ BuildKernel %make_target %kernel_image smp
make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
%if %{with_perf} %if %{with_perf}
# perf # perf
%{perf_make} all %{perf_make} DESTDIR=$RPM_BUILD_ROOT all
%{perf_make} man || %{doc_build_fail}
%endif %endif
%if %{with_tools} %if %{with_tools}
@ -1892,7 +1894,7 @@ find $RPM_BUILD_ROOT/usr/include \
%if %{with_perf} %if %{with_perf}
# perf tool binary and supporting scripts/binaries # perf tool binary and supporting scripts/binaries
%{perf_make} DESTDIR=$RPM_BUILD_ROOT install %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-bin
# remove the 'trace' symlink. # remove the 'trace' symlink.
rm -f %{buildroot}%{_bindir}/trace rm -f %{buildroot}%{_bindir}/trace
@ -1900,7 +1902,10 @@ rm -f %{buildroot}%{_bindir}/trace
%{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext
# perf man pages (note: implicit rpm magic compresses them later) # perf man pages (note: implicit rpm magic compresses them later)
%{perf_make} DESTDIR=$RPM_BUILD_ROOT install-man || %{doc_build_fail} mkdir -p %{buildroot}/%{_mandir}/man1
pushd %{buildroot}/%{_mandir}/man1
tar -xf %{SOURCE10}
popd
%endif %endif
%if %{with_tools} %if %{with_tools}
@ -2204,6 +2209,11 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Sat Dec 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Wrap doc BR in with_doc
- Stop building perf in build AND install because that's stupid
- Use prebuilt perf man pages
* Fri Dec 13 2013 Josh Boyer <jwboyer@fedoraproject.org> * Fri Dec 13 2013 Josh Boyer <jwboyer@fedoraproject.org>
- More keys fixes from upstream to fix keyctl_get_persisent crash (rhbz 1043033) - More keys fixes from upstream to fix keyctl_get_persisent crash (rhbz 1043033)

1
sources
View File

@ -1,3 +1,4 @@
cc6ee608854e0da4b64f6c1ff8b6398c linux-3.12.tar.xz cc6ee608854e0da4b64f6c1ff8b6398c linux-3.12.tar.xz
be2604350d32ab4967f9773920de1ec8 patch-3.13-rc3.xz be2604350d32ab4967f9773920de1ec8 patch-3.13-rc3.xz
9455f561b79edc6ae7487ebabb456b87 patch-3.13-rc3-git4.xz 9455f561b79edc6ae7487ebabb456b87 patch-3.13-rc3-git4.xz
a1a1e715cc0c95b4c90d432290b4ee96 perf-man.tar.gz