kernel-6.3.0-0.rc0.20230301gitc0927a7a5391.11

* Wed Mar 01 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc0.c0927a7a5391.11]
- fix tools build after vm to mm rename (Justin M. Forbes)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2023-03-01 08:40:23 -06:00
parent 787f06f245
commit 053618ba13
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
3 changed files with 33 additions and 21 deletions

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 9
RHEL_RELEASE = 11
#
# ZSTREAM

View File

@ -106,12 +106,6 @@ Summary: The Linux kernel
%global zipmodules 1
%endif
%ifarch x86_64
%global efiuki 1
%else
%global efiuki 0
%endif
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
%endif
@ -147,13 +141,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 6.3.0
%define patchversion 6.3
%define pkgrelease 0.rc0.20230228gitae3419fbac84.9
%define pkgrelease 0.rc0.20230301gitc0927a7a5391.11
%define kversion 6
%define tarfile_release 6.2-12913-gae3419fbac84
%define tarfile_release 6.2-12998-gc0927a7a5391
# This is needed to do merge window version magic
%define patchlevel 3
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.20230228gitae3419fbac84.9%{?buildid}%{?dist}
%define specrelease 0.rc0.20230301gitc0927a7a5391.11%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.3.0
@ -251,6 +245,12 @@ Summary: The Linux kernel
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
%ifarch x86_64
%define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1}
%else
%define with_efiuki 0
%endif
%if 0%{?fedora}
# Kernel headers are being split out into a separate package
%define with_headers 0
@ -720,7 +720,7 @@ BuildRequires: llvm
BuildRequires: lld
%endif
%if %{efiuki}
%if %{with_efiuki}
BuildRequires: dracut
# For dracut UEFI uki binaries
BuildRequires: binutils
@ -1367,7 +1367,7 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
%endif\
%{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
%endif\
%if %{efiuki}\
%if %{with_efiuki}\
%package %{?1:%{1}-}uki-virt\
Summary: %{variant_summary} unified kernel image for virtual machines\
Provides: installonlypkg(kernel)\
@ -1443,7 +1443,7 @@ Linux operating system. The kernel handles the basic functions
of the operating system: memory allocation, process allocation, device
input and output, etc.
%if %{efiuki}
%if %{with_efiuki}
%description debug-uki-virt
Prebuilt debug unified kernel image for virtual machines.
@ -2235,7 +2235,7 @@ BuildKernel() {
touch lib/modules/$KernelVer/modules.builtin
fi
%if %{efiuki}
%if %{with_efiuki}
popd
KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer"
@ -2271,7 +2271,7 @@ BuildKernel() {
pushd $RPM_BUILD_ROOT
# efiuki
# with_efiuki
%endif
remove_depmod_files
@ -3044,7 +3044,7 @@ then\
fi\
%{nil}
%if %{efiuki}
%if %{with_efiuki}
%kernel_uki_virt_scripts
%endif
@ -3057,7 +3057,7 @@ fi\
%endif
%if %{with_debug}
%if %{efiuki}
%if %{with_efiuki}
%kernel_uki_virt_scripts debug
%endif
%kernel_variant_preun debug
@ -3309,7 +3309,7 @@ fi
%{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\
%endif\
%endif\
%if %{efiuki}\
%if %{with_efiuki}\
%{expand:%%files %{?3:%{3}-}uki-virt}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi\
%ghost /%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}-virt.efi\
@ -3352,6 +3352,18 @@ fi
#
#
%changelog
* Wed Mar 01 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.3.0-0.rc0.20230301gitc0927a7a5391.11]
- Add rtla-hwnoise files (Justin M. Forbes)
- Revert "redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency" (Justin M. Forbes)
* Wed Mar 01 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc0.c0927a7a5391.11]
- fix tools build after vm to mm rename (Justin M. Forbes)
* Wed Mar 01 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc0.c0927a7a5391.10]
- redhat: modify efiuki specfile changes to use variants convention (Clark Williams)
- Turn off DEBUG_INFO_COMPRESSED_ZLIB for Fedora (Justin M. Forbes)
- Linux v6.3.0-0.rc0.c0927a7a5391
* Tue Feb 28 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc0.ae3419fbac84.9]
- redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency (Prarit Bhargava)
- Add hashtable_test to mod-internal.list (Justin M. Forbes)

View File

@ -1,3 +1,3 @@
SHA512 (linux-6.2-12913-gae3419fbac84.tar.xz) = d111126815fe235b60c6a6ac829aa769326228e55a299cde77c581b0d5fa9cad1a6e677e50897bf5073cd3b796ac9f03a338b0390e35f0c2c8b00ca05b64c56a
SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 76893f19b39a0294ad01769e8b5cf9af9ba06ac5014aab91604a57fa90d2b8385ecd163d8887bd1ca63d476b5e5814e854b277cf0feb62ed401084a56b59346a
SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = abebfcec71bd9947c29a2bb6b84e4df4180f1a2239b5b0d6208086d5f5718abbdb08f1a165964a0ac534dbd145f11021fce1cb0e451145165eb503f8735c4e70
SHA512 (linux-6.2-12998-gc0927a7a5391.tar.xz) = a42f48d3291f10079aa29ce04656fff0dd53429d56fabe468cb719c57fc7ee13e94219fe3fbaeeff51cd980c0df5f1b9277ad2b5ed58f658cca21c65cc8fbd68
SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 49c3824e52b304c882bfc906bd3573960c65ba64af89f428278d4d6937420b0e4d5db04fe6ee95e9f733fbfac7c90dd4863599568a1923ab2a06499495397ad1
SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = eeb40dded21f47b22dfe9eb1ba7698e15701d687999cf7170409735fea317d0f5085e768003f2ce7a7a6f00beac8c72629c11ca7c6dfd93332d0b13d4fce7d0e