diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-22 19:00:05 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-22 19:00:05 +0200 |
commit | 1f6428a19b9215788a0a647fd6cae28e5f5f2e49 (patch) | |
tree | 822e7470b02ad7bf8e3289c0fbbb4df537fb441f /kernel.spec | |
parent | 04d3b4e0573978cbdac824d67d0a5b8152991cd8 (diff) | |
parent | 62fc3a8b7c8e8b6d3abd2054ddaa89f9bc240458 (diff) | |
download | kernel-1f6428a19b9215788a0a647fd6cae28e5f5f2e49.tar.gz kernel-1f6428a19b9215788a0a647fd6cae28e5f5f2e49.tar.xz kernel-1f6428a19b9215788a0a647fd6cae28e5f5f2e49.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc7.20220722git68e77ffbfd06.56.vanilla.1.fc37kernel-5.19.0-0.rc7.20220722git68e77ffbfd06.56.vanilla.1.fc36kernel-5.19.0-0.rc7.20220722git68e77ffbfd06.56.vanilla.1.fc35
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 150febb35..1df7fc2fe 100755 --- a/kernel.spec +++ b/kernel.spec @@ -128,13 +128,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.19.0 %define patchversion 5.19 -%define pkgrelease 0.rc7.20220721git353f7988dd84.55 +%define pkgrelease 0.rc7.20220722git68e77ffbfd06.56 %define kversion 5 -%define tarfile_release 5.19-rc7-7-g353f7988dd84 +%define tarfile_release 5.19-rc7-135-g68e77ffbfd06 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20220721git353f7988dd84.55%{?buildid}%{?dist} +%define specrelease 0.rc7.20220722git68e77ffbfd06.56%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.19.0 @@ -1896,10 +1896,10 @@ BuildKernel() { rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py %ifarch s390x - # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline.o + # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline/expoline.o # which is needed during external module build. - if [ -f arch/s390/lib/expoline.o ]; then - cp -a --parents arch/s390/lib/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + if [ -f arch/s390/lib/expoline/expoline.o ]; then + cp -a --parents arch/s390/lib/expoline/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build fi %endif @@ -3147,6 +3147,18 @@ fi # # %changelog +* Fri Jul 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.68e77ffbfd06.55] +- create-data: Parallelize spec file data (Prarit Bhargava) +- create-data.sh: Store SOURCES Makefile variable (Prarit Bhargava) +- redhat/Makefile: Split up setup-source target (Prarit Bhargava) +- create-data.sh: Redefine varfilename (Prarit Bhargava) +- create-data.sh: Parallelize variable file creation (Prarit Bhargava) +- redhat/configs: Enable CONFIG_LZ4_COMPRESS (Prarit Bhargava) +- redhat/docs: Update brew information (Prarit Bhargava) +- redhat/Makefile: Fix eln BUILD_TARGET (Prarit Bhargava) +- redhat/Makefile: Set BUILD_TARGET for dist-brew (Prarit Bhargava) +- kernel.spec.template: update (s390x) expoline.o path (Joe Lawrence) + * Tue Jul 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.ca85855bdcae.53] - arm64: config: Enable DRM_V3D (Nicolas Saenz Julienne) - ARM: configs: Enable DRM_V3D (Peter Robinson) |