January 2023 - kernel - Fedora mailing-lists

[OS-BUILD PATCHv5] redhat/kernel.spec.template: Parallelize compression
by Prarit Bhargava (via Email Bridge) 23 Jan '23

23 Jan '23

From: Prarit Bhargava <prarit(a)redhat.com> redhat/kernel.spec.template: Parallelize compression This line in the kernel.spec file: find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; implies that ${RPM_BUILD_NCPUS} xz instances are run. This is not true, and this line actually applies ${RPM_BUILD_NCPUS} to a single instance of xz. This means that the compression has been done one module at a time (ie, in serial) rather than in parallel as is implied by the code. Use xarg's -n option to assign one cpu per process and parallelize the compression. Suggested-by: "Herton R. Krzesinski" <herton(a)redhat.com> Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -2472,7 +2472,8 @@ find Documentation -type d | xargs chmod u+w fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; \ + echo "Compressing kernel modules ..." \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 1 -P${RPM_BUILD_NCPUS} -r xz; \ fi \ %{nil} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2254

3 4

[OS-BUILD PATCH] Modularize CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU
by Mark Salter (via Email Bridge) 23 Jan '23

23 Jan '23

From: Mark Salter <msalter(a)redhat.com> Modularize CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU Build arm coresight system pmu as a module. Signed-off-by: Mark Salter <msalter(a)redhat.com> diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU @@ -1 +1 @@ -CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=y +CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2259

1 0

[OS-BUILD PATCH] Modularize CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU
by Mark Salter (via Email Bridge) 23 Jan '23

23 Jan '23

From: Mark Salter <msalter(a)redhat.com> Modularize CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU MakeBuild arm coresight system pmu as a module. Signed-off-by: Mark Salter <msalter(a)redhat.com> diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU @@ -1 +1 @@ -CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=y +CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2258

1 0

Two other build warnings and one output change
by Prarit Bhargava 22 Jan '23

22 Jan '23

Hey everyone, I just posted https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2255 to fix three build warnings, as well as some output from pathfix.py. There still are two other build warnings and one set of messages that need to be fixed but require further discussion. 1) https://src.fedoraproject.org/rpms/kernel-srpm-macros/pull-request/6 Hopefully self-explanatory via the link :) but it fixes the "readelf: /tmp/find-provides.ksyms.XXXXXX.ko: Warning: Section '.rodata' was not dumped because it does not exist" errors in the rpm log. 2) The signing code should be moved into it's own script. If you look at a rpm build log [1] you'll find lines like <snip> + shift + shift + [[ 15 -ge 2 ]] + case " ${1} " in + client_cert[0]=-c + client_cert[1]='/CN=Fedora Secure Boot Signer' + shift + shift + [[ 13 -ge 2 ]] + case " ${1} " in + cert[0]=-c + cert[1]='Red Hat Test Certificate' + shift <snip> from the signing code. While the execution of this code is interesting, I'm not sure it should be verbose in every log. I propose to push this code into it's own separate script to keep the log a bit cleaner. If users do need to debug this code they can add an -xv to the bash header and run through koji that way. 3) The kernel-devel absolute symlink The log contains this error: absolute symlink: /lib/modules/6.2.0-0.rc4.7287904c8771.33.test.fc36.x86_64/build -> /usr/src/kernels/6.2.0-0.rc4.7287904c8771.33.test.fc36.x86_64 From the kernel.spec.template:2235 # This is going to create a broken link during the build, but we don't use # it after this point. We need the link to actually point to something # when kernel-devel is installed, and a relative link doesn't work across # the F17 UsrMove feature. ln -sf $DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build I understand why this link exists, however, I wonder if the link should be created in the pre-install section of either the kernel-core rpm or the kernel-devel rpm instead (and of course, clean it up in the pre-uninstall sections)? AFAICT that would work and would give us a cleaner rpm build. P.

1 0

[OS-BUILD PATCHv4] redhat/kernel.spec.template: Parallelize compression
by Prarit Bhargava (via Email Bridge) 22 Jan '23

22 Jan '23

From: Prarit Bhargava <prarit(a)redhat.com> redhat/kernel.spec.template: Parallelize compression This line in the kernel.spec file: find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; implies that ${RPM_BUILD_NCPUS} xz instances are run. This is not true, and this line actually applies ${RPM_BUILD_NCPUS} to a single instance of xz. This means that the compression has been done one module at a time (ie, in serial) rather than in parallel as is implied by the code. Use xz's -n option to assign one cpu per process and parallelize the compression. Suggested-by: "Herton R. Krzesinski" <herton(a)redhat.com> Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -2472,7 +2472,8 @@ find Documentation -type d | xargs chmod u+w fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; \ + echo "Compressing kernel modules ..." \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 1 -P${RPM_BUILD_NCPUS} -r xz; \ fi \ %{nil} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2254

2 1

[OS-BUILD PATCHv3] redhat/kernel.spec.template: Parallelize compression
by Prarit Bhargava (via Email Bridge) 21 Jan '23

21 Jan '23

From: Prarit Bhargava <prarit(a)redhat.com> redhat/kernel.spec.template: Parallelize compression This line in the kernel.spec file: find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; implies that ${RPM_BUILD_NCPUS} xz instances are run. This is not true, and this line actually applies ${RPM_BUILD_NCPUS} to a single instance of xz. This means that the compression has been done one module at a time (ie, in serial) rather than in parallel as is implied by the code. Use xz's -n option to assign one cpu per process and parallelize the compression. Suggested-by: "Herton R. Krzesinski" <herton(a)redhat.com> Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -2472,7 +2472,8 @@ find Documentation -type d | xargs chmod u+w fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; \ + echo "Compressing kernel modules ..." + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 1 -P${RPM_BUILD_NCPUS} -r xz; \ fi \ %{nil} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2254

1 0

[OS-BUILD PATCHv2] redhat/kernel.spec.template: Parallelize compression
by Prarit Bhargava (via Email Bridge) 21 Jan '23

21 Jan '23

From: Prarit Bhargava <prarit(a)redhat.com> redhat/kernel.spec.template: Parallelize compression This line in the kernel.spec file: find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; implies that ${RPM_BUILD_NCPUS} xz instances are run. This is not true, and this line actually applies ${RPM_BUILD_NCPUS} to a single instance of xz. This means that the compression has been done one module at a time (ie, in serial) rather than in parallel as is implied by the code. Use xz's -n option to assign one cpu per process and parallelize the compression. Suggested-by: "Herton R. Krzesinski" <herton(a)redhat.com> Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -2472,7 +2472,7 @@ find Documentation -type d | xargs chmod u+w fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 1 -P${RPM_BUILD_NCPUS} -r xz; \ fi \ %{nil} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2254

1 1

[OS-BUILD PATCH] redhat/kernel.spec.template: Parallelize compression
by Prarit Bhargava (via Email Bridge) 20 Jan '23

20 Jan '23

From: Prarit Bhargava <prarit(a)redhat.com> redhat/kernel.spec.template: Parallelize compression This line in the kernel.spec file: find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; implies that ${RPM_BUILD_NCPUS} xz instances are run. This is not true, and this line actually applies ${RPM_BUILD_NCPUS} to a single instance of xz. This means that the compression has been done one module at a time (ie, in serial) rather than in parallel as is implied by the code. Rewrite this code into a script and make the execution truly parallel. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -632,6 +632,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check scripts/mod/mod-internal.list \ scripts/mod/mod-partner.list \ scripts/mod/mod-sign.sh \ + scripts/mod/mod-compress.sh \ configs/flavors \ configs/generate_all_configs.sh \ configs/merge.pl \ diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -767,6 +767,8 @@ Source21: mod-sign.sh %define modsign_cmd %{SOURCE21} +Source22: mod-compress.sh + %if 0%{?include_rhel} Source23: x509.genkey.rhel @@ -2472,7 +2474,8 @@ find Documentation -type d | xargs chmod u+w fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} -r xz; \ + echo "Compressing modules ..." \ + %{SOURCE22} "$RPM_BUILD_ROOT/lib/modules/" "${RPM_BUILD_NCPUS}" \ fi \ %{nil} diff --git a/redhat/scripts/mod/mod-compress.sh b/redhat/scripts/mod/mod-compress.sh new file mode 100755 index blahblah..blahblah 100755 --- /dev/null +++ b/redhat/scripts/mod/mod-compress.sh @@ -0,0 +1,22 @@ +#!/usr/bin/bash + +BUILD_DIR=$1 +NCPUS=$2 + +if [ ! -e "$BUILD_DIR" ]; then + echo "Could not find $BUILD_DIR" + exit 1 +fi + +modcount=0 +for module in $(find "$BUILD_DIR" -name *.ko) +do + xz $module & + waitpids[${modcount}]=$! + modcount=$(expr $modcount + 1) + while [ "$(jobs | grep -c Running)" -ge "$NCPUS" ]; do :; done +done + +for pid in ${waitpids[*]}; do + wait ${pid} +done -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2254

2 1

[OS-BUILD PATCHv4] redhat: Add sub-RPM with a EFI unified kernel image for virtual machines
by Vitaly Kuznetsov (via Email Bridge) 20 Jan '23

20 Jan '23

From: Vitaly Kuznetsov <vkuznets(a)redhat.com> redhat: Add sub-RPM with a EFI unified kernel image for virtual machines The new 'kernel-unified-virt' sub-RPM is added on x86_64 targets. This contains an EFI application that provides a combined vmlinux, initrd and cmdline, as a so called 'unified kernel image'. The spec for this is defined by the boot loader specification https://uapi-group.org/specifications/specs/boot_loader_specification/ The key benefit of a unified kernel is that its secure boot signature covers the initrd and cmdline contents, allowing a trustworthy measured boot process with attestation, which is not practical with locally generated initrds/cmdlines. Since the initrd is pre-generated its contents have to be very generic, to be usable on a wide variety of deployments. To make this problem tractable, the sub-RPM targets only usage in virtual machines. With such a restriction, the initrd only needs a very small set of block driver modules present, in order to be usable across KVM, Hyper-V and Xen hypervisors which will cover essentially all common public and private clouds. Similarly the kernel cmdline cannot contain any host specific data, which means the root filesystem to mount needs to be able to be automatically detected. A virtual machine image intending to use this unified kernel package thus needs to comply with the discoverable partitions specification: https://uapi-group.org/specifications/specs/discoverable_partitions_specifi… Based-on-patch-by: Daniel P. Berrangé <berrange(a)redhat.com> Based-on-patch-by: Gerd Hoffmann <kraxel(a)redhat.com> Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -639,6 +639,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check ../Makefile.rhelver \ README.rst \ kernel-local \ + dracut-virt.conf \ $(SOURCES)/ @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ diff --git a/redhat/dracut-virt.conf b/redhat/dracut-virt.conf new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/dracut-virt.conf @@ -0,0 +1,35 @@ +# generic + compressed please +hostonly="no" +compress="xz" + +# VMs can't update microcode anyway +early_microcode="no" + +# modules: basics +dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown " + +# modules: storage support +dracutmodules+=" dm lvm rootfs-block fs-lib " + +# modules: tpm and crypto +dracutmodules+=" crypt crypt-loop tpm2-tss " + +# drivers: virtual buses, pci +drivers+=" virtio-pci virtio-mmio " # qemu-kvm +drivers+=" hv-vmbus pci-hyperv " # hyperv +drivers+=" xen-pcifront " # xen + +# drivers: storage +drivers+=" ahci nvme scsi-hd scsi-cd " # generic +drivers+=" virtio-blk virtio-scsi " # qemu-kvm +drivers+=" hv-storvsc " # hyperv +drivers+=" xen-blkfront " # xen + +# root encryption +drivers+=" dm_crypt " + +# filesystems +filesystems+=" vfat ext4 xfs overlay " + +# systemd-pcrphase +install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service " diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -91,6 +91,12 @@ 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 @@ -699,6 +705,21 @@ BuildRequires: llvm BuildRequires: lld %endif +%if %{efiuki} +BuildRequires: dracut +# For dracut UEFI uki binaries +BuildRequires: binutils +# For the initrd +BuildRequires: lvm2 +%if 0%{?fedora} > 37 +BuildRequires: systemd-boot-unsigned +%endif +# For systemd-stub and systemd-pcrphase +BuildRequires: systemd-udev >= 252-1 +# For TPM operations in UKI initramfs +BuildRequires: tpm2-tools +%endif + # Because this is the kernel, it's hard to get a single upstream URL # to represent the base without needing to do a bunch of patching. This # tarball is generated from a src-git tree. If you want to see the @@ -826,6 +847,8 @@ Source82: update_scripts.sh Source84: mod-internal.list Source85: mod-partner.list +Source86: dracut-virt.conf + Source100: rheldup3.x509 Source101: rhelkpatch1.x509 @@ -1331,6 +1354,13 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ %endif\ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ +%if %{efiuki}\ +%package %{?1:%{1}-}uki-virt\ +Summary: %{variant_summary} unified kernel image for virtual machines\ +Provides: installonlypkg(kernel)\ +Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ +%endif\ %{nil} # @@ -1400,6 +1430,14 @@ Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device input and output, etc. +%if %{efiuki} +%description debug-uki-virt +Prebuilt debug unified kernel image for virtual machines. + +%description uki-virt +Prebuilt default unified kernel image for virtual machines. +%endif + %if %{with_ipaclones} %kernel_ipaclones_package %endif @@ -2180,6 +2218,45 @@ BuildKernel() { touch lib/modules/$KernelVer/modules.builtin fi +%if %{efiuki} + popd + + KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer" + KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi" + + mkdir -p $KernelUnifiedImageDir + + dracut --conf=%{SOURCE86} \ + --confdir=$(mktemp -d) \ + --verbose \ + --kver "$KernelVer" \ + --kmoddir "$RPM_BUILD_ROOT/lib/modules/$KernelVer/" \ + --logfile=$(mktemp) \ + --uefi \ + --kernel-image $(realpath $KernelImage) \ + --kernel-cmdline 'console=tty0 console=ttyS0' \ + $KernelUnifiedImage + +%if %{signkernel} + + %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} + %pesign -s -i $KernelUnifiedImage.tmp -o $KernelUnifiedImage.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1} + rm -f $KernelUnifiedImage.tmp + + if [ ! -s $KernelUnifiedImage.signed ]; then + echo "pesigning failed" + exit 1 + fi + mv $KernelUnifiedImage.signed $KernelUnifiedImage + +# signkernel +%endif + + pushd $RPM_BUILD_ROOT + +# efiuki +%endif + remove_depmod_files # Go back and find all of the various directories in the tree. We use this @@ -2873,12 +2950,14 @@ fi\ # It also defines a %%postun script that does the same thing. # %%kernel_modules_core_post [<subpackage>] # +# FIXME: /bin/kernel-install can't handle UKIs (yet), so cleanup depmod files in %postun for now. +# %define kernel_modules_core_post() \ %{expand:%%posttrans %{?1:%{1}-}modules-core}\ /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ %{nil}\ %{expand:%%postun %{?1:%{1}-}modules-core}\ -/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +rm -f /lib/modules/%{KVERREL}%{?1:+%{1}}/modules.*\ %{nil} # This macro defines a %%posttrans script for a kernel package. @@ -2926,6 +3005,20 @@ mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%{-v*}}\ %{nil} +# +# This macro defines scripts for a kernel*-uki-virt package +# +# FIXME: /bin/kernel-install can't handle UKIs (yet), so just cp/rm as temporary stop-gap +# +%define kernel_uki_virt_scripts() \ +%{expand:%%posttrans %{?1:%{1}-}uki-virt}\ +mkdir -p /boot/efi/EFI/Linux\ +cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +%{nil}\ +%{expand:%%postun %{?1:%{1}-}uki-virt}\ +rm -f /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +%{nil} + # # This macro defines a %%preun script for a kernel package. # %%kernel_variant_preun <subpackage> @@ -2939,6 +3032,10 @@ then\ fi\ %{nil} +%if %{efiuki} +%kernel_uki_virt_scripts +%endif + %kernel_variant_preun %kernel_variant_post -r kernel-smp @@ -2948,6 +3045,9 @@ fi\ %endif %if %{with_debug} +%if %{efiuki} +%kernel_uki_virt_scripts debug +%endif %kernel_variant_preun debug %kernel_variant_post -v debug %endif @@ -3188,6 +3288,11 @@ fi %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ %endif\ %endif\ +%if %{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\ +%endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ %endif\ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2175

1 0

[OS-BUILD PATCH] RHMAINTAINERS: Update for Jan 20 2023
by Prarit Bhargava (via Email Bridge) 20 Jan '23

20 Jan '23

From: Prarit Bhargava <prarit(a)redhat.com> RHMAINTAINERS: Update for Jan 20 2023 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -538,7 +538,7 @@ F: block/ F: drivers/block/ BLUETOOTH SUBSYSTEM -M: Gopal Tiwari <gtiwari(a)redhat.com> +M: David Marlin <dmarlin(a)redhat.com> S: Supported F: drivers/bluetooth/ F: include/net/bluetooth/ @@ -671,6 +671,7 @@ F: drivers/misc/ F: include/linux/miscdevice.h CIFS FILESYSTEM +M: Ronnie Sahlberg <lsahlber(a)redhat.com> S: Supported F: fs/cifs/ @@ -765,6 +766,8 @@ CRYPTO API M: Herbert Xu <herbert.xu(a)redhat.com> M: "David S. Miller" <davem(a)redhat.com> M: Vladis Dronov <vdronov(a)redhat.com> +M: Clemens Lang <cllang(a)redhat.com> +M: Simo Sorce <simo(a)redhat.com> R: Ondrej Mosnacek <omosnace(a)redhat.com> R: Phil Auld <pauld(a)redhat.com> S: Supported @@ -1161,7 +1164,6 @@ F: Documentation/ABI/stable/sysfs-bus-vmbus F: Documentation/ABI/testing/debugfs-hyperv I2C SUBSYSTEM -M: Gopal Tiwari <gtiwari(a)redhat.com> M: David Arcari <darcari(a)redhat.com> R: Tony Camuso <tcamuso(a)redhat.com> S: Supported @@ -1404,6 +1406,7 @@ M: Paolo Bonzini <pbonzini(a)redhat.com> M: Bandan Das <bsd(a)redhat.com> M: Vitaly Kuznetsov <vkuznets(a)redhat.com> S: Supported +F: drivers/virt/tdx F: Documentation/virt/kvm/ F: include/trace/events/kvm.h F: include/uapi/asm-generic/kvm* @@ -1538,6 +1541,7 @@ F: arch/x86/include/asm/livepatch.h F: arch/x86/kernel/livepatch.c F: include/linux/livepatch.h F: kernel/livepatch/ +F: kernel/module/livepatch.c F: lib/livepatch/ F: samples/livepatch/ F: tools/objtool/ @@ -1669,12 +1673,6 @@ M: Prarit Bhargava <prarit(a)redhat.com> S: Supported F: drivers/mfd/ -MICRON PCIe SSD DRIVER (mtip32xx) -M: Gopal Tiwari <gtiwari(a)redhat.com> -S: Supported -F: drivers/block/mtip32xx/mtip32xx.c -F: drivers/block/mtip32xx/mtip32xx.h - MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi) M: Don Brace <dbrace(a)redhat.com> M: Tomas Henzl <thenzl(a)redhat.com> @@ -2426,6 +2424,7 @@ R: Luis Claudio Goncalves <lgoncalv(a)redhat.com> R: Nico Pache <npache(a)redhat.com> R: Oleg Nesterov <onestero(a)redhat.com> R: Valentin Schneider <vschneid(a)redhat.com> +R: John B. Wyatt IV <jwyatt(a)redhat.com> S: Supported F: kernel/sched/ F: include/linux/sched/ @@ -2712,6 +2711,7 @@ F: usr/ VFIO DRIVER M: Alex Williamson <alex.williamson(a)redhat.com> M: Eric Auger <eric.auger(a)redhat.com> +M: Cédric Le Goater <clg(a)redhat.com> L: rhvirt-patches(a)redhat.com S: Supported F: Documentation/vfio.txt @@ -2722,6 +2722,7 @@ F: include/uapi/linux/vfio.h VFIO MEDIATED DEVICE DRIVERS M: Alex Williamson <alex.williamson(a)redhat.com> M: Eric Auger <eric.auger(a)redhat.com> +M: Cédric Le Goater <clg(a)redhat.com> L: rhvirt-patches(a)redhat.com S: Supported F: Documentation/vfio-mediated-device.txt -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2252

1 0

[OS-BUILD PATCHv3] redhat: Add sub-RPM with a EFI unified kernel image for virtual machines
by Vitaly Kuznetsov (via Email Bridge) 20 Jan '23

20 Jan '23

From: Vitaly Kuznetsov <vkuznets(a)redhat.com> redhat: Add sub-RPM with a EFI unified kernel image for virtual machines The new 'kernel-unified-virt' sub-RPM is added on x86_64 targets. This contains an EFI application that provides a combined vmlinux, initrd and cmdline, as a so called 'unified kernel image'. The spec for this is defined by the boot loader specification https://uapi-group.org/specifications/specs/boot_loader_specification/ The key benefit of a unified kernel is that its secure boot signature covers the initrd and cmdline contents, allowing a trustworthy measured boot process with attestation, which is not practical with locally generated initrds/cmdlines. Since the initrd is pre-generated its contents have to be very generic, to be usable on a wide variety of deployments. To make this problem tractable, the sub-RPM targets only usage in virtual machines. With such a restriction, the initrd only needs a very small set of block driver modules present, in order to be usable across KVM, Hyper-V and Xen hypervisors which will cover essentially all common public and private clouds. Similarly the kernel cmdline cannot contain any host specific data, which means the root filesystem to mount needs to be able to be automatically detected. A virtual machine image intending to use this unified kernel package thus needs to comply with the discoverable partitions specification: https://uapi-group.org/specifications/specs/discoverable_partitions_specifi… Based-on-patch-by: Daniel P. Berrangé <berrange(a)redhat.com> Based-on-patch-by: Gerd Hoffmann <kraxel(a)redhat.com> Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -639,6 +639,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check ../Makefile.rhelver \ README.rst \ kernel-local \ + dracut-virt.conf \ $(SOURCES)/ @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ diff --git a/redhat/dracut-virt.conf b/redhat/dracut-virt.conf new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/dracut-virt.conf @@ -0,0 +1,35 @@ +# generic + compressed please +hostonly="no" +compress="xz" + +# VMs can't update microcode anyway +early_microcode="no" + +# modules: basics +dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown " + +# modules: storage support +dracutmodules+=" dm lvm rootfs-block fs-lib " + +# modules: tpm and crypto +dracutmodules+=" crypt crypt-loop tpm2-tss " + +# drivers: virtual buses, pci +drivers+=" virtio-pci virtio-mmio " # qemu-kvm +drivers+=" hv-vmbus pci-hyperv " # hyperv +drivers+=" xen-pcifront " # xen + +# drivers: storage +drivers+=" ahci nvme scsi-hd scsi-cd " # generic +drivers+=" virtio-blk virtio-scsi " # qemu-kvm +drivers+=" hv-storvsc " # hyperv +drivers+=" xen-blkfront " # xen + +# root encryption +drivers+=" dm_crypt " + +# filesystems +filesystems+=" vfat ext4 xfs overlay " + +# systemd-pcrphase +install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service " diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -91,6 +91,12 @@ 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 @@ -699,6 +705,21 @@ BuildRequires: llvm BuildRequires: lld %endif +%if %{efiuki} +BuildRequires: dracut +# For dracut UEFI uki binaries +BuildRequires: binutils +# For the initrd +BuildRequires: lvm2 +%if 0%{?fedora} > 37 +BuildRequires: systemd-boot-unsigned +%endif +# For systemd-stub and systemd-pcrphase +BuildRequires: systemd-udev >= 252-1 +# For TPM operations in UKI initramfs +BuildRequires: tpm2-tools +%endif + # Because this is the kernel, it's hard to get a single upstream URL # to represent the base without needing to do a bunch of patching. This # tarball is generated from a src-git tree. If you want to see the @@ -826,6 +847,8 @@ Source82: update_scripts.sh Source84: mod-internal.list Source85: mod-partner.list +Source86: dracut-virt.conf + Source100: rheldup3.x509 Source101: rhelkpatch1.x509 @@ -1331,6 +1354,13 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ %endif\ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ +%if %{efiuki}\ +%package %{?1:%{1}-}uki-virt\ +Summary: %{variant_summary} unified kernel image for virtual machines\ +Provides: installonlypkg(kernel)\ +Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ +%endif\ %{nil} # @@ -1400,6 +1430,14 @@ Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device input and output, etc. +%if %{efiuki} +%description debug-uki-virt +Prebuilt debug unified kernel image for virtual machines. + +%description uki-virt +Prebuilt default unified kernel image for virtual machines. +%endif + %if %{with_ipaclones} %kernel_ipaclones_package %endif @@ -2180,6 +2218,45 @@ BuildKernel() { touch lib/modules/$KernelVer/modules.builtin fi +%if %{efiuki} + popd + + KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer" + KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi" + + mkdir -p $KernelUnifiedImageDir + + dracut --conf=%{SOURCE86} \ + --confdir=$(mktemp -d) \ + --verbose \ + --kver "$KernelVer" \ + --kmoddir "$RPM_BUILD_ROOT/lib/modules/$KernelVer/" \ + --logfile=$(mktemp) \ + --uefi \ + --kernel-image $(realpath $KernelImage) \ + --kernel-cmdline 'console=tty0 console=ttyS0' \ + $KernelUnifiedImage + +%if %{signkernel} + + %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} + %pesign -s -i $KernelUnifiedImage.tmp -o $KernelUnifiedImage.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1} + rm -f $KernelUnifiedImage.tmp + + if [ ! -s $KernelUnifiedImage.signed ]; then + echo "pesigning failed" + exit 1 + fi + mv $KernelUnifiedImage.signed $KernelUnifiedImage + +# signkernel +%endif + + pushd $RPM_BUILD_ROOT + +# efiuki +%endif + remove_depmod_files # Go back and find all of the various directories in the tree. We use this @@ -2873,12 +2950,14 @@ fi\ # It also defines a %%postun script that does the same thing. # %%kernel_modules_core_post [<subpackage>] # +# FIXME: /bin/kernel-install can't handle UKIs (yet), so cleanup depmod files in %postun for now. +# %define kernel_modules_core_post() \ %{expand:%%posttrans %{?1:%{1}-}modules-core}\ /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ %{nil}\ %{expand:%%postun %{?1:%{1}-}modules-core}\ -/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +rm -f /lib/modules/%{KVERREL}%{?1:+%{1}}/modules.*\ %{nil} # This macro defines a %%posttrans script for a kernel package. @@ -2926,6 +3005,20 @@ mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%{-v*}}\ %{nil} +# +# This macro defines scripts for a kernel*-uki-virt package +# +# FIXME: /bin/kernel-install can't handle UKIs (yet), so just cp/rm as temporary stop-gap +# +%define kernel_uki_virt_scripts() \ +%{expand:%%posttrans %{?1:%{1}-}uki-virt}\ +mkdir -p /boot/efi/EFI/Linux\ +cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +%{nil}\ +%{expand:%%postun %{?1:%{1}-}uki-virt}\ +rm -f /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +%{nil} + # # This macro defines a %%preun script for a kernel package. # %%kernel_variant_preun <subpackage> @@ -2939,6 +3032,10 @@ then\ fi\ %{nil} +%if %{efiuki} +%kernel_uki_virt_scripts +%endif + %kernel_variant_preun %kernel_variant_post -r kernel-smp @@ -2948,6 +3045,9 @@ fi\ %endif %if %{with_debug} +%if %{efiuki} +%kernel_uki_virt_scripts debug +%endif %kernel_variant_preun debug %kernel_variant_post -v debug %endif @@ -3188,6 +3288,11 @@ fi %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ %endif\ %endif\ +%if %{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\ +%endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ %endif\ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2175

2 3

[OS-BUILD PATCHv2] redhat: Add sub-RPM with a EFI unified kernel image for virtual machines
by Vitaly Kuznetsov (via Email Bridge) 19 Jan '23

19 Jan '23

From: Vitaly Kuznetsov <vkuznets(a)redhat.com> redhat: Add sub-RPM with a EFI unified kernel image for virtual machines The new 'kernel-unified-virt' sub-RPM is added on x86_64 targets. This contains an EFI application that provides a combined vmlinux, initrd and cmdline, as a so called 'unified kernel image'. The spec for this is defined by the boot loader specification https://uapi-group.org/specifications/specs/boot_loader_specification/ The key benefit of a unified kernel is that its secure boot signature covers the initrd and cmdline contents, allowing a trustworthy measured boot process with attestation, which is not practical with locally generated initrds/cmdlines. Since the initrd is pre-generated its contents have to be very generic, to be usable on a wide variety of deployments. To make this problem tractable, the sub-RPM targets only usage in virtual machines. With such a restriction, the initrd only needs a very small set of block driver modules present, in order to be usable across KVM, Hyper-V and Xen hypervisors which will cover essentially all common public and private clouds. Similarly the kernel cmdline cannot contain any host specific data, which means the root filesystem to mount needs to be able to be automatically detected. A virtual machine image intending to use this unified kernel package thus needs to comply with the discoverable partitions specification: https://uapi-group.org/specifications/specs/discoverable_partitions_specifi… Based-on-patch-by: Daniel P. Berrangé <berrange(a)redhat.com> Based-on-patch-by: Gerd Hoffmann <kraxel(a)redhat.com> Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -639,6 +639,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check ../Makefile.rhelver \ README.rst \ kernel-local \ + dracut-virt.conf \ $(SOURCES)/ @if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \ cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \ diff --git a/redhat/dracut-virt.conf b/redhat/dracut-virt.conf new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/dracut-virt.conf @@ -0,0 +1,35 @@ +# generic + compressed please +hostonly="no" +compress="xz" + +# VMs can't update microcode anyway +early_microcode="no" + +# modules: basics +dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown " + +# modules: storage support +dracutmodules+=" dm lvm rootfs-block fs-lib " + +# modules: tpm and crypto +dracutmodules+=" crypt crypt-loop tpm2-tss " + +# drivers: virtual buses, pci +drivers+=" virtio-pci virtio-mmio " # qemu-kvm +drivers+=" hv-vmbus pci-hyperv " # hyperv +drivers+=" xen-pcifront " # xen + +# drivers: storage +drivers+=" ahci nvme scsi-hd scsi-cd " # generic +drivers+=" virtio-blk virtio-scsi " # qemu-kvm +drivers+=" hv-storvsc " # hyperv +drivers+=" xen-blkfront " # xen + +# root encryption +drivers+=" dm_crypt " + +# filesystems +filesystems+=" vfat ext4 xfs overlay " + +# systemd-pcrphase +install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service " diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -91,6 +91,12 @@ 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 @@ -699,6 +705,21 @@ BuildRequires: llvm BuildRequires: lld %endif +%if %{efiuki} +BuildRequires: dracut +# For dracut UEFI uki binaries +BuildRequires: binutils +# For the initrd +BuildRequires: lvm2 +%if 0%{?fedora} > 37 +BuildRequires: systemd-boot-unsigned +%endif +# For systemd-stub and systemd-pcrphase +BuildRequires: systemd-udev >= 252-1 +# For TPM operations in UKI initramfs +BuildRequires: tpm2-tools +%endif + # Because this is the kernel, it's hard to get a single upstream URL # to represent the base without needing to do a bunch of patching. This # tarball is generated from a src-git tree. If you want to see the @@ -826,6 +847,8 @@ Source82: update_scripts.sh Source84: mod-internal.list Source85: mod-partner.list +Source86: dracut-virt.conf + Source100: rheldup3.x509 Source101: rhelkpatch1.x509 @@ -1331,6 +1354,13 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ %endif\ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ +%if %{efiuki}\ +%package %{?1:%{1}-}uki-virt\ +Summary: %{variant_summary} unified kernel image for virtual machines\ +Provides: installonlypkg(kernel)\ +Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ +%endif\ %{nil} # @@ -1400,6 +1430,14 @@ Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device input and output, etc. +%if %{efiuki} +%description debug-uki-virt +Prebuilt debug unified kernel image for virtual machines. + +%description uki-virt +Prebuilt default unified kernel image for virtual machines. +%endif + %if %{with_ipaclones} %kernel_ipaclones_package %endif @@ -2180,6 +2218,45 @@ BuildKernel() { touch lib/modules/$KernelVer/modules.builtin fi +%if %{efiuki} + popd + + KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer" + KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi" + + mkdir -p $KernelUnifiedImageDir + + dracut --conf=%{SOURCE86} \ + --confdir=$(mktemp -d) \ + --verbose \ + --kver "$KernelVer" \ + --kmoddir "$RPM_BUILD_ROOT/lib/modules/$KernelVer/" \ + --logfile=$(mktemp) \ + --uefi \ + --kernel-image $(realpath $KernelImage) \ + --kernel-cmdline 'console=tty0 console=ttyS0' \ + $KernelUnifiedImage + +%if %{signkernel} + + %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} + %pesign -s -i $KernelUnifiedImage.tmp -o $KernelUnifiedImage.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1} + rm -f $KernelUnifiedImage.tmp + + if [ ! -s $KernelUnifiedImage.signed ]; then + echo "pesigning failed" + exit 1 + fi + mv $KernelUnifiedImage.signed $KernelUnifiedImage + +# signkernel +%endif + + pushd $RPM_BUILD_ROOT + +# efiuki +%endif + remove_depmod_files # Go back and find all of the various directories in the tree. We use this @@ -2873,12 +2950,14 @@ fi\ # It also defines a %%postun script that does the same thing. # %%kernel_modules_core_post [<subpackage>] # +# FIXME: /bin/kernel-install can't handle UKIs (yet), so cleanup depmod files in %postun for now. +# %define kernel_modules_core_post() \ %{expand:%%posttrans %{?1:%{1}-}modules-core}\ /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ %{nil}\ %{expand:%%postun %{?1:%{1}-}modules-core}\ -/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +rm -f /lib/modules/%{KVERREL}%{?1:+%{1}}/modules.*\ %{nil} # This macro defines a %%posttrans script for a kernel package. @@ -2926,6 +3005,20 @@ mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%{-v*}}\ %{nil} +# +# This macro defines scripts for a kernel*-uki-virt package +# +# FIXME: /bin/kernel-install can't handle UKIs (yet), so just cp/rm as temporary stop-gap +# +%define kernel_uki_virt_scripts() \ +%{expand:%%posttrans %{?1:%{1}-}uki-virt}\ +mkdir -p /boot/efi/EFI/Linux\ +cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +%{nil}\ +%{expand:%%postun %{?1:%{1}-}uki-virt}\ +rm -f /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\ +%{nil} + # # This macro defines a %%preun script for a kernel package. # %%kernel_variant_preun <subpackage> @@ -2939,6 +3032,10 @@ then\ fi\ %{nil} +%if %{efiuki} +%kernel_uki_virt_scripts +%endif + %kernel_variant_preun %kernel_variant_post -r kernel-smp @@ -2948,6 +3045,9 @@ fi\ %endif %if %{with_debug} +%if %{efiuki} +%kernel_uki_virt_scripts debug +%endif %kernel_variant_preun debug %kernel_variant_post -v debug %endif @@ -3188,6 +3288,11 @@ fi %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ %endif\ %endif\ +%if %{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\ +%endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ %endif\ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2175

3 4

[OS-BUILD PATCH] Enable TDX Guest driver
by Vitaly Kuznetsov (via Email Bridge) 19 Jan '23

19 Jan '23

From: Vitaly Kuznetsov <vkuznets(a)redhat.com> Enable TDX Guest driver Enable guest driver (attestation) for Intel TDX. Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> diff --git a/redhat/configs/common/generic/CONFIG_TDX_GUEST_DRIVER b/redhat/configs/common/generic/CONFIG_TDX_GUEST_DRIVER new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_TDX_GUEST_DRIVER @@ -0,0 +1 @@ +CONFIG_TDX_GUEST_DRIVER=m diff --git a/redhat/configs/pending-ark/generic/CONFIG_TDX_GUEST_DRIVER b/redhat/configs/pending-ark/generic/CONFIG_TDX_GUEST_DRIVER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_TDX_GUEST_DRIVER +++ /dev/null @@ -1,13 +0,0 @@ -# Symbol: TDX_GUEST_DRIVER [=n] -# Type : tristate -# Defined at drivers/virt/coco/tdx-guest/Kconfig:1 -# Prompt: TDX Guest driver -# Depends on: VIRT_DRIVERS [=y] && INTEL_TDX_GUEST [=y] -# Location: -# -> Device Drivers -# -> Virtualization drivers (VIRT_DRIVERS [=y]) -# -> TDX Guest driver (TDX_GUEST_DRIVER [=n]) -# -# -# -# CONFIG_TDX_GUEST_DRIVER is not set diff --git a/redhat/configs/pending-fedora/generic/CONFIG_TDX_GUEST_DRIVER b/redhat/configs/pending-fedora/generic/CONFIG_TDX_GUEST_DRIVER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-fedora/generic/CONFIG_TDX_GUEST_DRIVER +++ /dev/null @@ -1,13 +0,0 @@ -# Symbol: TDX_GUEST_DRIVER [=n] -# Type : tristate -# Defined at drivers/virt/coco/tdx-guest/Kconfig:1 -# Prompt: TDX Guest driver -# Depends on: VIRT_DRIVERS [=y] && INTEL_TDX_GUEST [=y] -# Location: -# -> Device Drivers -# -> Virtualization drivers (VIRT_DRIVERS [=y]) -# -> TDX Guest driver (TDX_GUEST_DRIVER [=n]) -# -# -# -# CONFIG_TDX_GUEST_DRIVER is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2250

1 0

✅ PASS (17/301 SKIPPED): Test report for 6.1.7-200.fc37 (fedora-37)
by cki-project＠redhat.com 18 Jan '23

18 Jan '23

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: 96299060 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/66181 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/… Affected tests: ppc64le - NFS Connectathon Issue: [upstream] [aarch64] [ampere] [altramax] 5.19.0-rc8 - panic __efi_rt_asm_wrapper+0x2c/0x4c efi_call_rts+0x260/0x3d4 URL: https://lore.kernel.org/all/CA+QYu4r50dDuTyWbAqjjbvniW6O6Nr4V+1A_G2f37EVHJt… Affected tests: aarch64 - Boot test Issue: avc: denied { name_bind } for pid=897864 comm="rpcbind" src=63924 scontext=system_u:system_r:rpcbind_t:s0 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=udp_socket permissive=1 URL: https://bugzilla.redhat.com/show_bug.cgi?id=1983604#c3 Affected tests: x86_64 - xfstests - nfsv4.2 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 `-' ______________________________________________________________________________

1 0

[OS-BUILD PATCHv2 0/0] fedora: Updates for 6.1 and 6.2 merge
by pbrobinson (via Email Bridge) 18 Jan '23

18 Jan '23

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2249 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. This updates a number of Fedora configs for the 6.1 merge. It removes a number of old video options that are masked against a deprecated config option now. It updates/removes a number of arm options where the arch has been specified so we're not needlessly building drivers as well as a few other cleanups. It enables a number of new arm drivers/HW particularly around the qcom SC8280XP platform, particularly audio, and the NVIDIA tegra platforms, Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/ark/generic/arm/aarch64/CONFIG_PINCTRL_IPQ8064 | 1 - redhat/configs/ark/generic/CONFIG_PINCTRL_IPQ4019 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_APQ8064 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_APQ8084 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_MSM8660 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_MSM8960 | 1 - redhat/configs/fedora/debug/arm/CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_FPDT | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_2645198 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_CLK_RK3588 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_DAVINCI | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_WCD934X | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_IOMMU_IO_PGTABLE_DART | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SMPRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_MFD_WCD934X | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_LPASS_LPI | 1 + redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8994 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MSM8994 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8998 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MSM8998 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SC7180 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SC7180 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SC7280_LPASS_LPI | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SC8180X | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SC8280XP_LPASS_LPI | 1 + redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6115 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6115 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6125 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6125 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6350 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6350 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6375 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6375 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM8250_LPASS_LPI | 1 + redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM8350 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM8350 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM8450_LPASS_LPI | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SC_DISPCC_8280XP | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SC_GCC_8280XP | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SC_GPUCC_8280XP | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_SENSORS_SMPRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SMPRO_ERRMON | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SMPRO_MISC | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_RX_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_TX_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_VA_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_WSA_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_WCD934X | 1 + redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8226 => redhat/configs/fedora/generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8226 | 0 redhat/configs/fedora/generic/arm/armv7/lpae/CONFIG_GPIO_DAVINCI | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_ARCH_NPCM | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_CLK_RV1126 | 1 + redhat/configs/fedora/generic/arm/CONFIG_DRM_SUN4I_HDMI => redhat/configs/fedora/generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI | 0 redhat/configs/fedora/generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC => redhat/configs/fedora/generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC | 0 redhat/configs/fedora/generic/arm/armv7/CONFIG_MFD_PALMAS | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_MDM9615 | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_MSM8996 | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_PALMAS | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_SDM845 | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_PWM_PXA | 1 + redhat/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_PALMAS | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_USB_MUSB_AM35X | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_VIDEO_IMX7_CSI | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_NPCM => redhat/configs/fedora/generic/arm/CONFIG_ARCH_NPCM | 0 redhat/configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_2441007 | 1 + redhat/configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_2658417 | 1 + redhat/configs/fedora/generic/arm/armv7/CONFIG_ARM_TI_CPUFREQ => redhat/configs/fedora/generic/arm/CONFIG_ARM_TI_CPUFREQ | 0 redhat/configs/fedora/generic/arm/CONFIG_CLK_IMX93 | 2 +- redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG | 1 + redhat/configs/fedora/generic/arm/CONFIG_DWMAC_TEGRA | 1 + redhat/configs/fedora/generic/arm/CONFIG_IMX7ULP_WDT | 2 +- redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_IMX93 | 2 +- redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SC8180X | 1 - redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SC8280XP | 1 - redhat/configs/fedora/generic/arm/CONFIG_QCOM_SPMI_RRADC | 2 +- redhat/configs/fedora/generic/arm/CONFIG_SC_DISPCC_8280XP | 1 + redhat/configs/fedora/generic/arm/CONFIG_SMC911X | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_SOF_IMX8ULP => redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_SOF_IMX8ULP | 0 redhat/configs/fedora/generic/arm/CONFIG_SND_SUN50I_DMIC | 2 +- redhat/configs/fedora/generic/arm/CONFIG_VIDEO_AMPHION_VPU | 2 +- redhat/configs/fedora/generic/CONFIG_VIDEO_DW100 => redhat/configs/fedora/generic/arm/CONFIG_VIDEO_DW100 | 0 redhat/configs/fedora/generic/arm/CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 | 1 + redhat/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_MIPI_CSIS | 2 +- redhat/configs/fedora/generic/arm/CONFIG_VIDEO_SUN6I_ISP | 1 + redhat/configs/fedora/generic/arm/CONFIG_XLNX_R5_REMOTEPROC | 1 + redhat/configs/fedora/generic/powerpc/CONFIG_DRM_OFDRM | 1 + redhat/configs/fedora/generic/x86/CONFIG_ADVANTECH_EC_WDT | 1 + redhat/configs/fedora/generic/x86/CONFIG_BMC150_MAGN | 1 - redhat/configs/fedora/generic/x86/CONFIG_CROS_HPS_I2C | 1 + redhat/configs/fedora/generic/x86/CONFIG_HP_WATCHDOG | 1 - redhat/configs/fedora/generic/CONFIG_ACPI_FFH | 1 + redhat/configs/fedora/generic/CONFIG_BMC150_MAGN | 1 - redhat/configs/fedora/generic/x86/CONFIG_BMC150_MAGN_I2C => redhat/configs/fedora/generic/CONFIG_BMC150_MAGN_I2C | 0 redhat/configs/fedora/generic/CONFIG_BMC150_MAGN_SPI | 1 + redhat/configs/fedora/generic/CONFIG_BMI160_I2C | 1 + redhat/configs/fedora/generic/CONFIG_BMI160_SPI | 1 + redhat/configs/fedora/generic/CONFIG_CROS_HPS_I2C | 1 + redhat/configs/fedora/generic/CONFIG_DRM_ACCEL | 1 + redhat/configs/pending-fedora/generic/CONFIG_EFI_HANDOVER_PROTOCOL => redhat/configs/fedora/generic/CONFIG_EFI_HANDOVER_PROTOCOL | 0 redhat/configs/fedora/generic/CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI | 1 + redhat/configs/fedora/generic/CONFIG_GPIO_LATCH | 1 + redhat/configs/fedora/generic/CONFIG_INPUT_IBM_PANEL | 2 +- redhat/configs/fedora/generic/CONFIG_MFD_MT6370 | 2 +- redhat/configs/fedora/generic/CONFIG_MFD_SMPRO | 1 + redhat/configs/fedora/generic/CONFIG_MFD_TPS65219 | 1 + redhat/configs/fedora/generic/CONFIG_MFD_WCD934X | 1 - redhat/configs/fedora/generic/CONFIG_NVMEM_U_BOOT_ENV | 2 +- redhat/configs/fedora/generic/CONFIG_RTW88_8723DU | 1 + redhat/configs/fedora/generic/CONFIG_RTW88_8821CU | 1 + redhat/configs/fedora/generic/CONFIG_RTW88_8822BU | 1 + redhat/configs/fedora/generic/CONFIG_RTW88_8822CU | 1 + redhat/configs/fedora/generic/CONFIG_RTW89_8852BE | 1 + redhat/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C | 2 +- redhat/configs/fedora/generic/CONFIG_VIDEO_CPIA2 | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_HEXIUM_GEMINI | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_HEXIUM_ORION | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_MEYE | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_MXB | 1 - redhat/configs/pending-fedora/generic/CONFIG_ACPI_FFH | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_ADVANTECH_EC_WDT | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_ARM64_ERRATUM_2645198 | 12 ------- redhat/configs/pending-fedora/generic/CONFIG_ARM_TI_CPUFREQ | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_CLK_RK3588 | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_CROS_HPS_I2C | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_DRM_ACCEL | 12 ------- redhat/configs/pending-fedora/generic/CONFIG_DRM_OFDRM | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_DWMAC_TEGRA | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_GPIO_LATCH | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_MFD_SMPRO | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_MFD_TPS65219 | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_PWM_PXA | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8723DU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8821CU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8822BU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8822CU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW89_8852BE | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_SC_DISPCC_8280XP | 15 -------- redhat/configs/pending-fedora/generic/CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 | 15 -------- redhat/configs/pending-fedora/generic/CONFIG_VIDEO_SUN6I_ISP | 16 --------- redhat/configs/pending-fedora/generic/CONFIG_XLNX_R5_REMOTEPROC | 15 -------- 134 files changed, 68 insertions(+), 393 deletions(-)

1 1

[OS-BUILD PATCH] redhat: remove unused script redhat/configs/merge.pl
by Clark Williams (via Email Bridge) 18 Jan '23

18 Jan '23

From: Clark Williams <williams(a)redhat.com> redhat: remove unused script redhat/configs/merge.pl The perl script redhat/configs/merge.pl was rewritten for maintainability reasons into python as merge.py. Remove the unused script. Signed-off-by: Clark Williams <williams(a)redhat.com> diff --git a/redhat/configs/merge.pl b/redhat/configs/merge.pl deleted file mode 100755 index blahblah..blahblah 0 --- a/redhat/configs/merge.pl +++ /dev/null @@ -1,72 +0,0 @@ -#! /usr/bin/perl - -my @args=@ARGV; -my %configvalues; -my @configoptions; -my $configcounter = 0; - -# optionally print out the architecture as the first line of our output -my $arch = $args[2]; -if (defined $arch) { - print "# $arch\n"; -} - -# first, read the override file - -open (FILE,"$args[0]") || die "Could not open $args[0]"; -while (<FILE>) { - my $str = $_; - my $configname; - - if (/\# ([\w]+) is not set/) { - $configname = $1; - } elsif (/^\#/) { - # fall through on comments like 'avoid CONFIG_FOO=y' - ; - } elsif (/([\w]+)=/) { - $configname = $1; - } - - if (defined($configname) && !exists($configvalues{$configname})) { - $configvalues{$configname} = $str; - $configoptions[$configcounter] = $configname; - $configcounter ++; - } -}; - -# now, read and output the entire configfile, except for the overridden -# parts... for those the new value is printed. - -open (FILE2,"$args[1]") || die "Could not open $args[1]"; -while (<FILE2>) { - my $configname; - - if (/\# ([\w]+) is not set/) { - $configname = $1; - } elsif (/^\#/) { - # fall through on comments like 'avoid CONFIG_FOO=y' - ; - } elsif (/([\w]+)=/) { - $configname = $1; - } - - if (defined($configname) && exists($configvalues{$configname})) { - print "$configvalues{$configname}"; - delete($configvalues{$configname}); - } else { - print "$_"; - } -} - -# now print the new values from the overridden configfile -my $counter = 0; - -while ($counter < $configcounter) { - my $configname = $configoptions[$counter]; - if (exists($configvalues{$configname})) { - print "$configvalues{$configname}"; - } - $counter++; -} - -1; -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2246

2 3

[OS-BUILD PATCH 0/0] fedora: Updates for 6.1 and 6.2 merge
by pbrobinson (via Email Bridge) 18 Jan '23

18 Jan '23

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2249 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. This updates a number of Fedora configs for the 6.1 merge. It removes a number of old video options that are masked against a deprecated config option now. It updates/removes a number of arm options where the arch has been specified so we're not needlessly building drivers as well as a few other cleanups. It enables a number of new arm drivers/HW particularly around the qcom SC8280XP platform, particularly audio, and the NVIDIA tegra platforms, Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/ark/generic/arm/aarch64/CONFIG_PINCTRL_IPQ8064 | 1 - redhat/configs/ark/generic/CONFIG_PINCTRL_IPQ4019 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_APQ8064 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_APQ8084 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_MSM8660 | 1 - redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_MSM8960 | 1 - redhat/configs/fedora/debug/arm/CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_FPDT | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_2645198 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_CLK_RK3588 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_DAVINCI | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_WCD934X | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_IOMMU_IO_PGTABLE_DART | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SMPRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_MFD_WCD934X | 1 + redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8994 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MSM8994 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8998 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MSM8998 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SC7180 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SC7180 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SC8180X | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SC8280XP_LPASS_LPI | 1 + redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6115 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6115 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6125 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6125 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6350 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6350 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM6375 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM6375 | 0 redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SM8350 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SM8350 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_SC_DISPCC_8280XP | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SC_GCC_8280XP | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SC_GPUCC_8280XP | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_SENSORS_SMPRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SMPRO_ERRMON | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SMPRO_MISC | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_RX_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_TX_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_VA_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_LPASS_WSA_MACRO | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_WCD934X | 1 + redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8226 => redhat/configs/fedora/generic/arm/armv7/armv7/CONFIG_PINCTRL_MSM8226 | 0 redhat/configs/fedora/generic/arm/armv7/lpae/CONFIG_GPIO_DAVINCI | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_ARCH_NPCM | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_CLK_RV1126 | 1 + redhat/configs/fedora/generic/arm/CONFIG_DRM_SUN4I_HDMI => redhat/configs/fedora/generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI | 0 redhat/configs/fedora/generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC => redhat/configs/fedora/generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC | 0 redhat/configs/fedora/generic/arm/armv7/CONFIG_MFD_PALMAS | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_MDM9615 | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_MSM8996 | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_PALMAS | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_SDM845 | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_PWM_PXA | 1 + redhat/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_PALMAS | 2 +- redhat/configs/fedora/generic/arm/armv7/CONFIG_USB_MUSB_AM35X | 1 - redhat/configs/fedora/generic/arm/armv7/CONFIG_VIDEO_IMX7_CSI | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_NPCM => redhat/configs/fedora/generic/arm/CONFIG_ARCH_NPCM | 0 redhat/configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_2441007 | 1 + redhat/configs/fedora/generic/arm/CONFIG_ARM64_ERRATUM_2658417 | 1 + redhat/configs/fedora/generic/arm/armv7/CONFIG_ARM_TI_CPUFREQ => redhat/configs/fedora/generic/arm/CONFIG_ARM_TI_CPUFREQ | 0 redhat/configs/fedora/generic/arm/CONFIG_CLK_IMX93 | 2 +- redhat/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG | 1 + redhat/configs/fedora/generic/arm/CONFIG_DWMAC_TEGRA | 1 + redhat/configs/fedora/generic/arm/CONFIG_IMX7ULP_WDT | 2 +- redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_IMX93 | 2 +- redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SC8180X | 1 - redhat/configs/fedora/generic/arm/CONFIG_PINCTRL_SC8280XP | 1 - redhat/configs/fedora/generic/arm/CONFIG_QCOM_SPMI_RRADC | 2 +- redhat/configs/fedora/generic/arm/CONFIG_SC_DISPCC_8280XP | 1 + redhat/configs/fedora/generic/arm/CONFIG_SMC911X | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_SOF_IMX8ULP => redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_SOF_IMX8ULP | 0 redhat/configs/fedora/generic/arm/CONFIG_SND_SUN50I_DMIC | 2 +- redhat/configs/fedora/generic/arm/CONFIG_VIDEO_AMPHION_VPU | 2 +- redhat/configs/fedora/generic/CONFIG_VIDEO_DW100 => redhat/configs/fedora/generic/arm/CONFIG_VIDEO_DW100 | 0 redhat/configs/fedora/generic/arm/CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 | 1 + redhat/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_MIPI_CSIS | 2 +- redhat/configs/fedora/generic/arm/CONFIG_VIDEO_SUN6I_ISP | 1 + redhat/configs/fedora/generic/arm/CONFIG_XLNX_R5_REMOTEPROC | 1 + redhat/configs/fedora/generic/powerpc/CONFIG_DRM_OFDRM | 1 + redhat/configs/fedora/generic/x86/CONFIG_ADVANTECH_EC_WDT | 1 + redhat/configs/fedora/generic/x86/CONFIG_BMC150_MAGN | 1 - redhat/configs/fedora/generic/x86/CONFIG_CROS_HPS_I2C | 1 + redhat/configs/fedora/generic/x86/CONFIG_HP_WATCHDOG | 1 - redhat/configs/fedora/generic/CONFIG_ACPI_FFH | 1 + redhat/configs/fedora/generic/CONFIG_BMC150_MAGN | 1 - redhat/configs/fedora/generic/x86/CONFIG_BMC150_MAGN_I2C => redhat/configs/fedora/generic/CONFIG_BMC150_MAGN_I2C | 0 redhat/configs/fedora/generic/CONFIG_BMC150_MAGN_SPI | 1 + redhat/configs/fedora/generic/CONFIG_BMI160_I2C | 1 + redhat/configs/fedora/generic/CONFIG_BMI160_SPI | 1 + redhat/configs/fedora/generic/CONFIG_CROS_HPS_I2C | 1 + redhat/configs/fedora/generic/CONFIG_DRM_ACCEL | 1 + redhat/configs/pending-fedora/generic/CONFIG_EFI_HANDOVER_PROTOCOL => redhat/configs/fedora/generic/CONFIG_EFI_HANDOVER_PROTOCOL | 0 redhat/configs/fedora/generic/CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI | 1 + redhat/configs/fedora/generic/CONFIG_GPIO_LATCH | 1 + redhat/configs/fedora/generic/CONFIG_INPUT_IBM_PANEL | 2 +- redhat/configs/fedora/generic/CONFIG_MFD_MT6370 | 2 +- redhat/configs/fedora/generic/CONFIG_MFD_SMPRO | 1 + redhat/configs/fedora/generic/CONFIG_MFD_TPS65219 | 1 + redhat/configs/fedora/generic/CONFIG_MFD_WCD934X | 1 - redhat/configs/fedora/generic/CONFIG_NVMEM_U_BOOT_ENV | 2 +- redhat/configs/fedora/generic/CONFIG_RTW88_8723DU | 1 + redhat/configs/fedora/generic/CONFIG_RTW88_8821CU | 1 + redhat/configs/fedora/generic/CONFIG_RTW88_8822BU | 1 + redhat/configs/fedora/generic/CONFIG_RTW88_8822CU | 1 + redhat/configs/fedora/generic/CONFIG_RTW89_8852BE | 1 + redhat/configs/fedora/generic/CONFIG_SERIAL_SC16IS7XX_I2C | 2 +- redhat/configs/fedora/generic/CONFIG_VIDEO_CPIA2 | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_HEXIUM_GEMINI | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_HEXIUM_ORION | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_MEYE | 1 - redhat/configs/fedora/generic/CONFIG_VIDEO_MXB | 1 - redhat/configs/pending-fedora/generic/CONFIG_ACPI_FFH | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_ADVANTECH_EC_WDT | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_ARM64_ERRATUM_2645198 | 12 ------- redhat/configs/pending-fedora/generic/CONFIG_ARM_TI_CPUFREQ | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_CLK_RK3588 | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_CROS_HPS_I2C | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_DRM_ACCEL | 12 ------- redhat/configs/pending-fedora/generic/CONFIG_DRM_OFDRM | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_DWMAC_TEGRA | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_GPIO_LATCH | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_MFD_SMPRO | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_MFD_TPS65219 | 14 -------- redhat/configs/pending-fedora/generic/CONFIG_PWM_PXA | 13 ------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8723DU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8821CU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8822BU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW88_8822CU | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_RTW89_8852BE | 17 ---------- redhat/configs/pending-fedora/generic/CONFIG_SC_DISPCC_8280XP | 15 -------- redhat/configs/pending-fedora/generic/CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 | 15 -------- redhat/configs/pending-fedora/generic/CONFIG_VIDEO_SUN6I_ISP | 16 --------- redhat/configs/pending-fedora/generic/CONFIG_XLNX_R5_REMOTEPROC | 15 -------- 130 files changed, 64 insertions(+), 393 deletions(-)

2 1

[OS-BUILD PATCH] Turn off CONFIG_MTK_T7XX for S390x
by Justin M. Forbes (via Email Bridge) 17 Jan '23

17 Jan '23

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Turn off CONFIG_MTK_T7XX for S390x A build issue crept in over the weekend with the MTK_T7XX driver and S390x. As I started digging, I realized this is likely hardware that would never be used with S390x, and might be better off just disabled for that arch. It is a driver for the MediaTek PCIe based 5G WWAN modem. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/common/generic/s390x/CONFIG_MTK_T7XX b/redhat/configs/common/generic/s390x/CONFIG_MTK_T7XX new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/s390x/CONFIG_MTK_T7XX @@ -0,0 +1 @@ +# CONFIG_MTK_T7XX is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2247

1 0

[OS-BUILD PATCHv7 0/4] makefile: Add -Werror support for RHEL
by Prarit Bhargava (via Email Bridge) 16 Jan '23

16 Jan '23

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2240 The -Werror flag should be enabled for RHEL. In ARK, however, it is a bit tricky to enable -Werror as a build bug occasionally leaks through upstream review and into Linus' tree, and the toolchain is rebased which causes many new errors to be reported. As a consequence, -Werror cannot be enabled in ARK but the code to enable it for RHEL can be added to the top-level makefile. Additional fixes: Alphabetize Makefile.variables (something I've wanted to do for a while now) and remove a mention of Makefile.rhkpg. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/configs/build_configs.sh | 5 + redhat/Makefile.variables | 184 ++++++++++++++++++++------------------- makefile | 7 + 3 files changed, 105 insertions(+), 91 deletions(-)

2 6

[OS-BUILD PATCHv6 0/4] makefile: Add -Werror support for RHEL
by Prarit Bhargava (via Email Bridge) 16 Jan '23

16 Jan '23

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2240 The -Werror flag should be enabled for RHEL. In ARK, however, it is a bit tricky to enable -Werror as a build bug occasionally leaks through upstream review and into Linus' tree, and the toolchain is rebased which causes many new errors to be reported. As a consequence, -Werror cannot be enabled in ARK but the code to enable it for RHEL can be added to the top-level makefile. Additional fixes: Alphabetize Makefile.variables (something I've wanted to do for a while now) and remove a mention of Makefile.rhkpg. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/configs/build_configs.sh | 5 + redhat/Makefile.variables | 184 ++++++++++++++++++++------------------- makefile | 13 ++ 3 files changed, 111 insertions(+), 91 deletions(-)

2 9

[OS-BUILD PATCH] Fix up configs with SND_SOC_NAU8315 mismatch
by Justin M. Forbes (via Email Bridge) 16 Jan '23

16 Jan '23

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Fix up configs with SND_SOC_NAU8315 mismatch Upstream commit ba7523bb0f494fc440d3a9bb0b665cfcaa192d0c now selects SND_SOC_NAU8315 if SND_SOC_INTEL_SOF_NAU8825_MACH is set. This forces us to either turn on SND_SOC_NAU8315 or turn off SND_SOC_INTEL_SOF_NAU8825_MACH. I chose the later to keep existing functionality, though can change this for RHEL if it is preferred to turn off SND_SOC_NAU8315. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 b/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 +++ b/redhat/configs/common/generic/CONFIG_SND_SOC_NAU8315 @@ -1 +1 @@ -# CONFIG_SND_SOC_NAU8315 is not set +CONFIG_SND_SOC_NAU8315=m diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_NAU8315 b/redhat/configs/fedora/generic/CONFIG_SND_SOC_NAU8315 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_NAU8315 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_NAU8315=m diff --git a/redhat/configs/pending-ark/generic/CONFIG_SND_SOC_NAU8315 b/redhat/configs/pending-ark/generic/CONFIG_SND_SOC_NAU8315 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/CONFIG_SND_SOC_NAU8315 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_NAU8315=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2245

1 0

✅ PASS (3/301 SKIPPED): Test report for 6.1.6-200.fc37 (fedora-37)
by cki-project＠redhat.com 14 Jan '23

14 Jan '23

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: 96130436 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/65744 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: Storage block - storage fio numa: Performance comparison: min:40535 * 1.15 < max:81259 URL: https://bugzilla.redhat.com/show_bug.cgi?id=2032094 Affected tests: aarch64 - Storage - block - storage fio numa x86_64 - Storage - block - storage fio numa Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/… Affected tests: aarch64 - NFS Connectathon 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 `-' ______________________________________________________________________________

1 0

✅ PASS (66/301 SKIPPED): Test report for 6.1.5-200.fc37 (fedora-37)
by cki-project＠redhat.com 12 Jan '23

12 Jan '23

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: 96057056 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/65506 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: Storage blktests - blk: scsi/007: Reading from scsi_debug failed URL: https://bugzilla.redhat.com/show_bug.cgi?id=2027550 Affected tests: s390x - Storage - blktests - blk x86_64 - Storage - blktests - blk Issue: [upstream] [aarch64] [ampere] [altramax] 5.19.0-rc8 - panic __efi_rt_asm_wrapper+0x2c/0x4c efi_call_rts+0x260/0x3d4 URL: https://lore.kernel.org/all/CA+QYu4r50dDuTyWbAqjjbvniW6O6Nr4V+1A_G2f37EVHJt… Affected tests: aarch64 - Boot test Issue: xfstests - _check_xfs_filesystem: filesystem on /dev/nvme0n1p4 is inconsistent (r) URL: https://bugzilla.redhat.com/show_bug.cgi?id=1989409 Affected tests: aarch64 - xfstests - btrfs 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 `-' ______________________________________________________________________________

1 0

[OS-BUILD PATCHv6 0/2] split sub-rpm kernel-modules-core from kernel-core
by Gerd Hoffmann (via Email Bridge) 12 Jan '23

12 Jan '23

From: Gerd Hoffmann on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2179 All kernel modules plus support files (such as the files generated by depmod) are moved to the new kernel-modules-core sub-rpm. The kernel binary plus support files stay in the kernel-core sub-rpm. This essentially includes the files which are copied over to /boot by the kernel-install utility (vmlinuz, System.map, ...). With this in place we have a strict separation between sub-rpms carrying a kernel image and sub-rpms carrying kernel modules. This should make it easier to use alternative kernel image packages, for example an unified kernel. --- redhat/kernel.spec.template | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 50 insertions(+), 3 deletions(-)

1 2

[OS-BUILD PATCH] redhat/configs: enable ChromeOS ACPI driver
by Mark Langsdorf (via Email Bridge) 12 Jan '23

12 Jan '23

From: Mark Langsdorf <mlangsdo(a)redhat.com> redhat/configs: enable ChromeOS ACPI driver Provide a device interface for exporting ACPI data on x86 Chromebooks. Signed-off-by: Mark Langsdorf <mlangsdo(a)redhat.com> diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI @@ -0,0 +1 @@ +CONFIG_CHROMEOS_ACPI=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2153

4 4

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel January 2023