summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-28 11:09:12 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-28 11:09:12 -0500
commit5ab16d21834c75e9a092dffbda8a808ca480272f (patch)
treea7a31a9bc4671e54b956a21cd522e2c629ab85b0 /kernel.spec
parentad07f83694b013ca55842016af04b1fb22d34270 (diff)
downloadkernel-5ab16d21834c75e9a092dffbda8a808ca480272f.tar.gz
kernel-5ab16d21834c75e9a092dffbda8a808ca480272f.tar.xz
kernel-5ab16d21834c75e9a092dffbda8a808ca480272f.zip
kernel-5.14.0-0.rc3.20210728git7d549995d4e0.31
* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.0-0.rc3.20210728git7d549995d4e0.31] - kernel-5.14.0-0.rc3.20210728git7d549995d4e0.31 (Fedora Kernel Team) - kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) - Don't tag a release as [redhat] (Justin M. Forbes) - Revert "Drop that for now" (Herton R. Krzesinski) - rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988] - configs/process_configs.sh: Handle config items with no help text (Patrick Talbert) - fedora: sound config updates for 5.14 (Peter Robinson) - fedora: Only enable FSI drivers on POWER platform (Peter Robinson) - The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson) - fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson) - fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson) - fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson) - Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson) - fedora: arm: disabled unused FB drivers (Peter Robinson) - fedora: don't enable FB_VIRTUAL (Peter Robinson) - redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075] - rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406] Resolves: rhbz#1940075, rhbz#1956988, rhbz#1981406 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec80
1 files changed, 66 insertions, 14 deletions
diff --git a/kernel.spec b/kernel.spec
index 22ff193a3..848114370 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -78,9 +78,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
-%global distro_build 0.rc3.29
+%global distro_build 0.rc3.20210728git7d549995d4e0.31
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -124,13 +124,13 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 0.rc3.29
+%define pkgrelease 0.rc3.20210728git7d549995d4e0.31
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.29%{?buildid}%{?dist}
+%define specrelease 0.rc3.20210728git7d549995d4e0.31%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -671,7 +671,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc3.tar.xz
+Source0: linux-5.14-rc3-14-g7d549995d4e0.tar.xz
Source1: Makefile.rhelver
@@ -1356,8 +1356,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14-rc3 -c
-mv linux-5.14-rc3 linux-%{KVERREL}
+%setup -q -n kernel-5.14-rc3-14-g7d549995d4e0 -c
+mv linux-5.14-rc3-14-g7d549995d4e0 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2206,12 +2206,10 @@ pushd tools/thermal/tmon/
%{tools_make}
popd
pushd tools/iio/
-# Needs to be fixed to pick up CFLAGS
-%{__make}
+%{tools_make}
popd
pushd tools/gpio/
-# Needs to be fixed to pick up CFLAGS
-%{__make}
+%{tools_make}
popd
# build VM tools
pushd tools/vm/
@@ -2466,10 +2464,10 @@ pushd tools/thermal/tmon
%{tools_make} INSTALL_ROOT=%{buildroot} install
popd
pushd tools/iio
-%{__make} DESTDIR=%{buildroot} install
+%{tools_make} DESTDIR=%{buildroot} install
popd
pushd tools/gpio
-%{__make} DESTDIR=%{buildroot} install
+%{tools_make} DESTDIR=%{buildroot} install
popd
install -m644 -D %{SOURCE2002} %{buildroot}%{_sysconfdir}/logrotate.d/kvm_stat
pushd tools/kvm/kvm_stat
@@ -2592,7 +2590,7 @@ if [ "$HARDLINK" != "no" -a -x /usr/bin/hardlink -a ! -e /run/ostree-booted ] \
then\
(cd /usr/src/kernels/%{KVERREL}%{?1:+%{1}} &&\
/usr/bin/find . -type f | while read f; do\
- hardlink -c /usr/src/kernels/*%{?dist}.*/$f $f\
+ hardlink -c /usr/src/kernels/*%{?dist}.*/$f $f > /dev/null\
done)\
fi\
%{nil}
@@ -2953,6 +2951,60 @@ fi
#
#
%changelog
+* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.0-0.rc3.20210728git7d549995d4e0.31]
+- kernel-5.14.0-0.rc3.20210728git7d549995d4e0.31 (Fedora Kernel Team)
+- kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team)
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- Revert "Drop that for now" (Herton R. Krzesinski)
+- rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988]
+- configs/process_configs.sh: Handle config items with no help text (Patrick Talbert)
+- fedora: sound config updates for 5.14 (Peter Robinson)
+- fedora: Only enable FSI drivers on POWER platform (Peter Robinson)
+- The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson)
+- fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson)
+- fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson)
+- fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson)
+- Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson)
+- fedora: arm: disabled unused FB drivers (Peter Robinson)
+- fedora: don't enable FB_VIRTUAL (Peter Robinson)
+- redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075]
+- rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406]
+
+* Wed Jul 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc3.20210728git7d549995d4e0.31]
+- kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team)
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- Revert "Drop that for now" (Herton R. Krzesinski)
+- rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988]
+- configs/process_configs.sh: Handle config items with no help text (Patrick Talbert)
+- fedora: sound config updates for 5.14 (Peter Robinson)
+- fedora: Only enable FSI drivers on POWER platform (Peter Robinson)
+- The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson)
+- fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson)
+- fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson)
+- fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson)
+- Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson)
+- fedora: arm: disabled unused FB drivers (Peter Robinson)
+- fedora: don't enable FB_VIRTUAL (Peter Robinson)
+- redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075]
+- rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406]
+
+* Wed Jul 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc3.20210728git7d549995d4e0.30]
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- Revert "Drop that for now" (Herton R. Krzesinski)
+- rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988]
+- configs/process_configs.sh: Handle config items with no help text (Patrick Talbert)
+- fedora: sound config updates for 5.14 (Peter Robinson)
+- fedora: Only enable FSI drivers on POWER platform (Peter Robinson)
+- The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson)
+- fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson)
+- fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson)
+- fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson)
+- Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson)
+- fedora: arm: disabled unused FB drivers (Peter Robinson)
+- fedora: don't enable FB_VIRTUAL (Peter Robinson)
+- redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075]
+- rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406]
+
* Sat Jul 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210723git8baef6386baa.27]
- Build Fedora x86s kernels with bytcr-wm5102 (Marius Hoch)
- Deleted redhat/configs/fedora/generic/x86/CONFIG_FB_HYPERV (Patrick Lang)