kernel-5.4.55-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12448 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kernel/kernel-vl.spec

@@ -26,8 +26,9 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define builddoc 0
 %define buildsource 0
 
-%define with_tools   1
+%define with_tools    1
-%define with_headers 1
+%define with_bpftool  1
+%define with_headers  1
 %define with_firmware 0
 
 # Versions of various parts
@@ -39,7 +40,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # adding some text to the end of the version number.
 #
 %define sublevel 4
-%define patchlevel 52
+%define patchlevel 55
 %define kversion 5.%{sublevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -72,7 +73,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 
 # source/doc build section is moved to x86_64
 %ifarch i686
-%define with_headers 0
+%define with_headers 1
 %define buildsource 0
 %define builddoc 0
 %define with_firmware 0
@@ -97,6 +98,16 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define builddoc 1
 %endif
 
+%if %{with systemd}
+%define builddoc      0
+%define buildsource   0
+%define buildup       0
+%define buildpae      0
+%define with_headers  0
+%define with_firmware 0
+%define with_tools    1
+%define with_bpftool  0
+%endif
 #
 # Three sets of minimum package version requirements in the form of Conflicts:
 # to versions below the minimum
@@ -139,6 +150,10 @@ Group: System Environment/Kernel
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	daisuke, shaolin, iwamoto
+
 ExclusiveArch: noarch i686 x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{rpmversion}
@@ -179,10 +194,6 @@ BuildRequires: libcap-devel
 %endif
 BuildRequires: zlib-devel binutils-devel
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	daisuke, shaolin, iwamoto
-
 Source0: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz
 Source10: COPYING.modules
 Source11: genkey
@@ -452,6 +463,7 @@ the kernel source.
 
 %endif # with_tools
 
+%if %{with_bpftool}
 %package -n bpftool
 Summary: Inspection and simple manipulation of eBPF programs and maps
 License: GPLv2
@@ -459,6 +471,7 @@ License: GPLv2
 %description -n bpftool
 This package contains the bpftool, which allows inspection and simple
 manipulation of eBPF programs and maps.
+%endif
 
 
 %prep
@@ -746,9 +759,11 @@ make
 popd
 %endif
 
+%if %{with_bpftool}
 pushd tools/bpf/bpftool
 %{__make} EXTRA_CFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}" DESTDIR=%{buildroot} V=1
 popd
+%endif
 
 
 ###
@@ -868,9 +883,11 @@ make INSTALL_ROOT=%{buildroot} install
 popd
 %endif
 
+%if %{with_bpftool}
 pushd tools/bpf/bpftool
 %{__make} EXTRA_CFLAGS="%{optflags}" EXTRA_LDFLAGS="%{?__global_ldflags}" DESTDIR=%{buildroot} V=1 prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/  mandir=%{_mandir} install
 popd
+%endif
 
 rm -f %{buildroot}%{_prefix}/src/linux-%{kversion}/.clang-format
 rm -f %{buildroot}%{_prefix}/src/linux-%{kversion}/.cocciconfig
@@ -1113,7 +1130,6 @@ fi
 %else
 /etc/rc.d/init.d/cpupower
 %endif
-
 %{_bindir}/x86_energy_perf_policy
 %{_mandir}/man8/x86_energy_perf_policy*
 %{_bindir}/turbostat
@@ -1133,13 +1149,19 @@ fi
 %{_includedir}/cpuidle.h
 %endif
 
+%if %{with_bpftool}
 %files -n bpftool
 %{_sbindir}/bpftool
 %dir %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/bash_completion.d/bpftool
+%endif
 
 
 %changelog
+* Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.55-1
+- updated to 5.4.55.
+- re-enabled to build kernel-headers on i686.
+
 * Sun Jul 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.52-1
 - updated to 5.4.52.
 - added systemd support (disabled as default).