From c49d88579875e966e2959d09a17f282dc9876324 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 2 Nov 2020 10:27:06 -0600 Subject: kernel-5.10.0-0.rc2.61.test * Mon Nov 02 2020 Fedora Kernel Team [5.10.0-0.rc2.61.test] - v5.10-rc2 rebase Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 96 +++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 34 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 07d15316f..1a1525a75 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc1.20201030git07e088730245.60 +%global distro_build 0.rc2.62 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -95,20 +95,19 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc1.20201030git07e088730245.60 +%define pkgrelease 0.rc2.62 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20201030git07e088730245.60%{?buildid}%{?dist} +%define specrelease 0.rc2.62%{?buildid}%{?dist} %define pkg_release %{specrelease} -# What parts do we want to build? We must build at least one kernel. -# These are the kernels that are built IF the architecture allows it. -# All should default to 1 (enabled) and be flipped to 0 (disabled) -# by later arch-specific checks. +# What parts do we want to build? These are the kernels that are built IF the +# architecture allows it. All should default to 1 (enabled) and be flipped to +# 0 (disabled) by later arch-specific checks. # The following build options are enabled by default. # Use either --without in your rpmbuild command or force values @@ -192,7 +191,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # The kernel tarball/base version %define kversion 5.10 @@ -525,6 +524,7 @@ BuildRequires: numactl-devel %endif %if %{with_tools} BuildRequires: gettext ncurses-devel +BuildRequires: libcap-devel libcap-ng-devel %ifnarch s390x BuildRequires: pciutils-devel %endif @@ -592,7 +592,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201030git07e088730245.tar.xz +Source0: linux-5.10-rc2.tar.xz Source1: Makefile.rhelver @@ -1236,8 +1236,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201030git07e088730245 -c -mv linux-20201030git07e088730245 linux-%{KVERREL} +%setup -q -n kernel-5.10-rc2 -c +mv linux-5.10-rc2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1364,33 +1364,18 @@ cp_vmlinux() %define make %{__make} %{?cross_opts} %{?make_opts} HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}" -BuildKernel() { - MakeTarget=$1 - KernelImage=$2 - Flavour=$4 - DoVDSO=$3 - Flav=${Flavour:++${Flavour}} - InstallName=${5:-vmlinuz} +InitBuildVars() { + # Initialize the kernel .config file and create some variables that are + # needed for the actual build process. - DoModules=1 - if [ "$Flavour" = "zfcpdump" ]; then - DoModules=0 - fi + Flavour=$1 + Flav=${Flavour:++${Flavour}} - # Pick the right config file for the kernel we're building + # Pick the right kernel config file Config=kernel-%{version}-%{_target_cpu}${Flavour:+-${Flavour}}.config DevelDir=/usr/src/kernels/%{KVERREL}${Flav} - # When the bootable image is just the ELF kernel, strip it. - # We already copy the unstripped file into the debuginfo package. - if [ "$KernelImage" = vmlinux ]; then - CopyKernel=cp_vmlinux - else - CopyKernel=cp - fi - KernelVer=%{version}-%{release}.%{_target_cpu}${Flav} - echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}... # make sure EXTRAVERSION says what we want it to say # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters @@ -1401,8 +1386,6 @@ BuildKernel() { # if we are post rc1 this should match anyway so this won't matter perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{patchlevel}/' Makefile - # and now to start the build process - %{make} %{?_smp_mflags} mrproper cp configs/$Config .config @@ -1419,6 +1402,32 @@ BuildKernel() { if [ "$Flavour" == "" ]; then KCFLAGS="$KCFLAGS %{?kpatch_kcflags}" fi +} + +BuildKernel() { + MakeTarget=$1 + KernelImage=$2 + Flavour=$4 + DoVDSO=$3 + Flav=${Flavour:++${Flavour}} + InstallName=${5:-vmlinuz} + + DoModules=1 + if [ "$Flavour" = "zfcpdump" ]; then + DoModules=0 + fi + + # When the bootable image is just the ELF kernel, strip it. + # We already copy the unstripped file into the debuginfo package. + if [ "$KernelImage" = vmlinux ]; then + CopyKernel=cp_vmlinux + else + CopyKernel=cp + fi + + InitBuildVars $Flavour + + echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}... %{make} ARCH=$Arch olddefconfig >/dev/null @@ -1946,6 +1955,14 @@ BuildKernel %make_target %kernel_image %{use_vdso} lpae BuildKernel %make_target %kernel_image %{_use_vdso} %endif +%ifnarch noarch i686 +%if !%{with_debug} && !%{with_zfcpdump} && !%{with_up} +# If only building the user space tools, then initialize the build environment +# and some variables so that the various userspace tools can be built. +InitBuildVars +%endif +%endif + %global perf_make \ %{__make} -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} @@ -2672,6 +2689,17 @@ fi # # %changelog +* Mon Nov 02 2020 Fedora Kernel Team [5.10.0-0.rc2.61.test] +- v5.10-rc2 rebase + +* Sun Nov 01 2020 Fedora Kernel Team [5.10.0-0.rc1.20201101gitc2dc4c073fb7.60.test] +- c2dc4c073fb7 rebase + +* Sat Oct 31 2020 Fedora Kernel Team [5.10.0-0.rc1.20201031git5fc6b075e165.59.test] +- 5fc6b075e165 rebase +- Allow building of kernel-tools standalone (Don Zickus) +- Allow kernel-tools to build without selftests (Don Zickus) + * Fri Oct 30 2020 Fedora Kernel Team [5.10.0-0.rc1.20201030git07e088730245.58.test] - 07e088730245 rebase - Fix LTO issues with kernel-tools (Don Zickus) -- cgit