From: Juri Lelli <juri.lelli(a)redhat.com>
redhat: Fix RT kernel kvm subpackage requires
kernel-rt-kvm package currently depends on kernel-rt meta-package, so it
fails to install if kernel-rt is not installed as well. All the other
kernel-rt-* packages however only depend on the kernel-uname-r so they
do not require the kernel-rt meta-package.
Layered products doesn't use kernel-rt meta-package to side load
kernels, as it would bring in unwanted additional dependency. They
install kernel-rt-* packages and this is then currently a problem for
kernel-rt-kvm.
kernel-rt-kvm doesn't actually require kernel-rt meta-package, but only
the correct kernel-rt (core) version. So, fix its dependencies
accordingly.
Signed-off-by: Juri Lelli <juri.lelli(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1504,7 +1504,7 @@ The meta-package for the %{1} kernel\
%package %{?1:%{1}-}kvm\
Summary: KVM modules for package kernel%{?1:-%{1}}\
Group: System Environment/Kernel\
-Requires: kernel%{?1:-%{1}} = %{version}-%{release}\
+Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-kvm-%{_target_cpu} = %{version}-%{release}\
AutoReq: no\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3029
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 115126473
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/135653
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Thorsten Leemhuis on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2975
NOTE: Truncated patchset since committer email 'fedora(a)leemhuis.info'
does not match the submitter's GitLab public email address
'linux(a)leemhuis.info'.
In the past few weeks while building linux-next for my kernel vanilla
repositories I noticed a few upstream changes that require changes to files
like mod-internal.list or filter-modules.sh.fedora for kernel-ark builds to
succeed. Changes like these will most likely be needed in kernel-ark/os-build
soon, as the those upstream changes are heading towards mainline currently.
I'm providing these changes here in advance in case they might helpful for
@jmflinuxtx, @caringi or somebody else (either for cherry-picking for for
merging as a whole).
---
redhat/scripts/mod/mod-internal.list | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
From: Thorsten Leemhuis on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2975
NOTE: Truncated patchset since committer email 'fedora(a)leemhuis.info'
does not match the submitter's GitLab public email address
'linux(a)leemhuis.info'.
In the past few weeks while building linux-next for my kernel vanilla
repositories I noticed a few upstream changes that require changes to files
like mod-internal.list or filter-modules.sh.fedora for kernel-ark builds to
succeed. Changes like these will most likely be needed in kernel-ark/os-build
soon, as the those upstream changes are heading towards mainline currently.
I'm providing these changes here in advance in case they might helpful for
@jmflinuxtx, @caringi or somebody else (either for cherry-picking for for
merging as a whole).
---
redhat/scripts/mod/mod-internal.list | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
From: Thorsten Leemhuis on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2975
NOTE: Truncated patchset since committer email 'fedora(a)leemhuis.info'
does not match the submitter's GitLab public email address
'linux(a)leemhuis.info'.
In the past few weeks while building linux-next for my kernel vanilla
repositories I noticed a few upstream changes that require changes to files
like mod-internal.list or filter-modules.sh.fedora for kernel-ark builds to
succeed. Changes like these will most likely be needed in kernel-ark/os-build
soon, as the those upstream changes are heading towards mainline currently.
I'm providing these changes here in advance in case they might helpful for
@jmflinuxtx, @caringi or somebody else (either for cherry-picking for for
merging as a whole).
---
redhat/scripts/mod/mod-internal.list | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
From: Thorsten Leemhuis on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2975
NOTE: Truncated patchset since committer email 'fedora(a)leemhuis.info'
does not match the submitter's GitLab public email address
'linux(a)leemhuis.info'.
In the past few weeks while building linux-next for my kernel vanilla
repositories I noticed a few upstream changes that require changes to files
like mod-internal.list or filter-modules.sh.fedora for kernel-ark builds to
succeed. Changes like these will most likely be needed in kernel-ark/os-build
soon, as the those upstream changes are heading towards mainline currently.
I'm providing these changes here in advance in case they might helpful for
@jmflinuxtx, @caringi or somebody else (either for cherry-picking for for
merging as a whole).
---
redhat/scripts/mod/mod-internal.list | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
From: glb on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3001
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
The Boot Loader Specification recommends that UEFI systems mount the ESP at
/boot. Since the ESP is commonly formatted with a non-POSIX file system,
symbolic links should not be placed on /boot.
ref: https://uapi-group.org/specifications/specs/boot_loader_specification
Signed-off-by: Gregory Bartholomew <gregory.lee.bartholomew(a)gmail.com>
---
redhat/kernel.spec.template | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
From: Scott Weaver <scweaver(a)redhat.com>
arch/x86/kernel/setup.c: fixup rh_check_supported
With 8078f4d6102f9 ('x86/cpu/topology: Rename smp_num_siblings') and
89b0f15f408f7 ('x86/cpu/topology: Get rid of cpuinfo::x86_max_cores')
the RHEL only rh_check_supported() needs updated to also replaced
boot_cpu_data.x86_max_cores and smp_num_siblings.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index blahblah..blahblah 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -679,7 +679,7 @@ static void rh_check_supported(void)
guest = (x86_hyper_type != X86_HYPER_NATIVE || boot_cpu_has(X86_FEATURE_HYPERVISOR));
/* RHEL supports single cpu on guests only */
- if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
+ if (((topology_num_threads_per_package() * __max_threads_per_core) == 1) &&
!guest && is_kdump_kernel()) {
pr_crit("Detected single cpu native boot.\n");
pr_crit("Important: In this kernel, single threaded, single CPU 64-bit physical systems are unsupported.");
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2979