.gitignore

@@ -1,10 +1,3 @@
-SOURCES/centossecureboot201.cer
+SOURCES/linux-5.14.0-283.rt14.283.el9.tar.xz
-SOURCES/centossecurebootca2.cer
-SOURCES/linux-4.18.0-553.155.1.rt7.496.el8_10.tar.xz
-SOURCES/redhatsecureboot302.cer
-SOURCES/redhatsecureboot303.cer
-SOURCES/redhatsecureboot501.cer
-SOURCES/redhatsecurebootca3.cer
-SOURCES/redhatsecurebootca7.cer
 SOURCES/rheldup3.x509
 SOURCES/rhelkpatch1.x509

.kernel-rt.metadata

@@ -1,10 +1,3 @@
-2ba40bf9138b48311e5aa1b737b7f0a8ad66066f SOURCES/centossecureboot201.cer
+38f5f84189c2579a1546acffb0fd03105f2608c0 SOURCES/linux-5.14.0-283.rt14.283.el9.tar.xz
-bfdb3d7cffc43f579655af5155d50c08671d95e5 SOURCES/centossecurebootca2.cer
-5dc61914b7c16bd6cd08b5f5509b4f917d107210 SOURCES/linux-4.18.0-553.155.1.rt7.496.el8_10.tar.xz
-13e5cd3f856b472fde80a4deb75f4c18dfb5b255 SOURCES/redhatsecureboot302.cer
-e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot303.cer
-ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
-cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer
-905d91a282727c7f5ad433a49ac42a0772311c6a SOURCES/redhatsecurebootca7.cer
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509

SOURCES/Makefile.rhelver

@@ -0,0 +1,69 @@
+RHEL_MAJOR = 9
+RHEL_MINOR = 2
+
+#
+# RHEL_RELEASE
+# -------------
+#
+# Represents build number in 'release' part of RPM's name-version-release.
+#   name is <package_name>, e.g. kernel
+#   version is upstream kernel version this kernel is based on, e.g. 4.18.0
+#   release is <RHEL_RELEASE>.<dist_tag>[<buildid>], e.g. 100.el8
+#
+# Use this spot to avoid future merge conflicts.
+# Do not trim this comment.
+RHEL_RELEASE = 283
+
+#
+# ZSTREAM
+# -------
+#
+#  This variable controls whether we use zstream numbering or not for the
+#  package release. The zstream release keeps the build number of the last
+#  build done for ystream for the Beta milestone, and increments a second
+#  number for each build. The third number is used for branched builds
+#  (eg.: for builds with security fixes or hot fixes done outside of the
+#  batch release process).
+#
+#  For example, with ZSTREAM unset or set to "no", all builds will contain
+#  a release with only the build number, eg.: kernel-<kernel version>-X.el*,
+#  where X is the build number. With ZSTREAM set to "yes", we will have
+#  builds with kernel-<kernel version>-X.Y.Z.el*, where X is the last
+#  RHEL_RELEASE number before ZSTREAM flag was set to yes, Y will now be the
+#  build number and Z will always be 1 except if you're doing a branched build
+#  (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
+#  number will be incremented instead of the Y).
+#
+ZSTREAM ?= no
+
+#
+# Early y+1 numbering
+# --------------------
+#
+# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y
+# First is RHEL_RELEASE inherited/merged from y as-is, second number
+# is incremented with each build starting from 1. After merge from y,
+# it resets back to 1. This way y+1 nvr reflects status of last merge.
+#
+# Example:
+#
+# rhel8.0                        rhel-8.1
+#   kernel-4.18.0-58.el8   -->     kernel-4.18.0-58.1.el8
+#                                  kernel-4.18.0-58.2.el8
+#   kernel-4.18.0-59.el8           kernel-4.18.0-59.1.el8
+#   kernel-4.18.0-60.el8
+#   kernel-4.18.0-61.el8   -->     kernel-4.18.0-61.1.el8
+#
+#
+# Use this spot to avoid future merge conflicts.
+# Do not trim this comment.
+EARLY_YSTREAM ?= no
+EARLY_YBUILD:=
+EARLY_YRELEASE:=
+ifneq ("$(ZSTREAM)", "yes")
+  ifeq ("$(EARLY_YSTREAM)","yes")
+    RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
+  endif
+endif
+
+RTBUILD:=.283

SOURCES/README.rst

@@ -0,0 +1,25 @@
+===================
+The Kernel dist-git
+===================
+
+The kernel is maintained in a `source tree`_ rather than directly in dist-git.
+The specfile is maintained as a `template`_ in the source tree along with a set
+of build scripts to generate configurations, (S)RPMs, and to populate the
+dist-git repository.
+
+The `documentation`_ for the source tree covers how to contribute and maintain
+the tree.
+
+If you're looking for the downstream patch set it's available in the source
+tree with "git log master..ark-patches" or
+`online`_.
+
+Each release in dist-git is tagged in the source repository so you can easily
+check out the source tree for a build. The tags are in the format
+name-version-release, but note release doesn't contain the dist tag since the
+source can be built in different build roots (Fedora, CentOS, etc.)
+
+.. _source tree: https://gitlab.com/cki-project/kernel-ark.git
+.. _template: https://gitlab.com/cki-project/kernel-ark/-/blob/os-build/redhat/kernel.spec.template
+.. _documentation: https://gitlab.com/cki-project/kernel-ark/-/wikis/home
+.. _online: https://gitlab.com/cki-project/kernel-ark/-/commits/ark-patches

SOURCES/check-kabi

@@ -0,0 +1,166 @@
+#!/usr/bin/python3
+#
+# check-kabi - Red Hat kABI reference checking tool
+#
+# We use this script to check against reference Module.kabi files.
+#
+# Author: Jon Masters <jcm@redhat.com>
+# Copyright (C) 2007-2009 Red Hat, Inc.
+#
+# This software may be freely redistributed under the terms of the GNU
+# General Public License (GPL).
+
+# Changelog:
+#
+# 2018/06/01 - Update for python3 by Petr Oros.
+# 2009/08/15 - Updated for use in RHEL6.
+# 2007/06/13 - Initial rewrite in python by Jon Masters.
+
+__author__ = "Jon Masters <jcm@redhat.com>"
+__version__ = "2.0"
+__date__ = "2009/08/15"
+__copyright__ = "Copyright (C) 2007-2009 Red Hat, Inc"
+__license__ = "GPL"
+
+import getopt
+import string
+import sys
+
+true = 1
+false = 0
+
+
+def load_symvers(symvers, filename):
+    """Load a Module.symvers file."""
+
+    symvers_file = open(filename, "r")
+
+    while true:
+        in_line = symvers_file.readline()
+        if in_line == "":
+            break
+        if in_line == "\n":
+            continue
+        checksum, symbol, directory, type, *ns = in_line.split()
+        ns = ns[0] if ns else None
+
+        symvers[symbol] = in_line[0:-1]
+
+
+def load_kabi(kabi, filename):
+    """Load a Module.kabi file."""
+
+    kabi_file = open(filename, "r")
+
+    while true:
+        in_line = kabi_file.readline()
+        if in_line == "":
+            break
+        if in_line == "\n":
+            continue
+        checksum, symbol, directory, type, *ns = in_line.split()
+        ns = ns[0] if ns else None
+
+        kabi[symbol] = in_line[0:-1]
+
+
+def check_kabi(symvers, kabi):
+    """Check Module.kabi and Module.symvers files."""
+
+    fail = 0
+    warn = 0
+    changed_symbols = []
+    moved_symbols = []
+    ns_symbols = []
+
+    for symbol in kabi:
+        abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split()
+        abi_ns = abi_ns[0] if abi_ns else None
+        if symbol in symvers:
+            sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split()
+            sym_ns = sym_ns[0] if sym_ns else None
+            if abi_hash != sym_hash:
+                fail = 1
+                changed_symbols.append(symbol)
+
+            if abi_dir != sym_dir:
+                warn = 1
+                moved_symbols.append(symbol)
+
+            if abi_ns != sym_ns:
+                warn = 1
+                ns_symbols.append(symbol)
+        else:
+            fail = 1
+            changed_symbols.append(symbol)
+
+    if fail:
+        print("*** ERROR - ABI BREAKAGE WAS DETECTED ***")
+        print("")
+        print("The following symbols have been changed (this will cause an ABI breakage):")
+        print("")
+        for symbol in changed_symbols:
+            print(symbol)
+        print("")
+
+    if warn:
+        print("*** WARNING - ABI SYMBOLS MOVED ***")
+        if moved_symbols:
+            print("")
+            print("The following symbols moved (typically caused by moving a symbol from being")
+            print("provided by the kernel vmlinux out to a loadable module):")
+            print("")
+            for symbol in moved_symbols:
+                print(symbol)
+            print("")
+        if ns_symbols:
+            print("")
+            print("The following symbols changed symbol namespaces:")
+            print("")
+            for symbol in ns_symbols:
+                print(symbol)
+            print("")
+
+    """Halt the build, if we got errors and/or warnings. In either case,
+       double-checkig is required to avoid introducing / concealing
+       KABI inconsistencies."""
+    if fail or warn:
+        sys.exit(1)
+    sys.exit(0)
+
+
+def usage():
+    print("""
+check-kabi: check Module.kabi and Module.symvers files.
+
+    check-kabi [ -k Module.kabi ] [ -s Module.symvers ]
+
+""")
+
+
+if __name__ == "__main__":
+
+    symvers_file = ""
+    kabi_file = ""
+
+    opts, args = getopt.getopt(sys.argv[1:], 'hk:s:')
+
+    for o, v in opts:
+        if o == "-s":
+            symvers_file = v
+        if o == "-h":
+            usage()
+            sys.exit(0)
+        if o == "-k":
+            kabi_file = v
+
+    if (symvers_file == "") or (kabi_file == ""):
+        usage()
+        sys.exit(1)
+
+    symvers = {}
+    kabi = {}
+
+    load_symvers(symvers, symvers_file)
+    load_kabi(kabi, kabi_file)
+    check_kabi(symvers, kabi)

SOURCES/dracut-virt.conf

@@ -0,0 +1,38 @@
+# 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 "
+
+# WALinuxagent-cvm with CVM specific udev rules
+dracutmodules+=" walinuxagentcvm "
+
+# 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 sd_mod sr_mod "     # 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 "

SOURCES/filter-aarch64.sh.rhel

@@ -15,4 +15,4 @@ ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco
 
 drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i tinydrm vc4"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"

SOURCES/filter-modules.sh.rhel

@@ -13,8 +13,11 @@
 # subsys should be in kernel-modules on all arches, please change the defaults
 # listed here.
 
+# Overrides is individual modules which need to remain in kernel-core due to deps.
+overrides="cec"
+
 # Set the default dirs/modules to filter out
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1 virt"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
 
 chardrvs="mwave pcmcia"
 
@@ -22,6 +25,8 @@ netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless"
 
 ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
 
+cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat"
+
 inputdrvs="gameport tablet touchscreen"
 
 scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic hisi_sas isci libsas lpfc megaraid mpt2sas mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf"
@@ -34,7 +39,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee80215
 
 drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr parport_serial ism xt_u32 act_ct"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor"
 
 # Grab the arch-specific filter list overrides
 source ./filter-$2.sh
@@ -88,7 +93,7 @@ done
 # Filter the char drivers
 for char in ${chardrvs}
 do
-	filter_dir $1 drivers/char/${input}
+	filter_dir $1 drivers/char/${char}
 done
 
 # Filter the ethernet drivers
@@ -97,6 +102,12 @@ do
 	filter_dir $1 drivers/net/ethernet/${eth}
 done
 
+# Filter the crypto drivers
+for crypt in ${cryptdrvs}
+do
+	filter_dir $1 drivers/crypto/${crypt}
+done
+
 # SCSI
 for scsi in ${scsidrvs}
 do
@@ -135,9 +146,7 @@ done
 
 # Just kill sound.
 filter_dir $1 kernel/sound
-filter_ko $1 drivers/base/regmap/regmap-sdw
+filter_dir $1 kernel/drivers/soundwire
-filter_ko $1 drivers/base/regmap/regmap-sdw-mbq
-filter_dir $1 drivers/soundwire
 
 # Now go through and filter any single .ko files that might have deps on the
 # things we filtered above
@@ -146,6 +155,20 @@ do
         filter_ko $1 ${mod}
 done
 
+# Now process the override list to bring those modules back into core
+for mod in ${overrides}
+do
+	grep -v -e "/${mod}.ko" k-d.list > k-d.list.tmp
+	if [ $? -ne 0 ]
+        then
+                echo "Couldn't save ${mod}.ko  Skipping."
+        else
+                grep -e "/${mod}.ko" k-d.list >> $filelist
+                mv k-d.list.tmp k-d.list
+        fi
+
+done
+
 # Go through our generated drivers list and remove the .ko files.  We'll
 # restore them later.
 for mod in `cat k-d.list`

SOURCES/filter-ppc64le.sh.rhel

@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"

SOURCES/gating.yaml

@@ -1,17 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-aarch64.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: cki.tier1-x86_64.functional}
-  - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-ppc64le.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-s390x.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-x86_64.tier1.functional}
-excluded_packages: [kernel-rt]
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.kernel-rt-x86_64.tier1.functional}
-packages: [kernel-rt]

SOURCES/generate_all_configs.sh

@@ -1,6 +1,36 @@
 #!/bin/sh
 
-for i in ${NAME}-*.config; do
+# Adjusts the configuration options to build the variants correctly
-	NEW=${NAME}-${VERSION}-$(echo $i | sed -e "s/${NAME}//" | cut -d - -f2-)
+
-	mv ${i} ${NEW}
+test -n "$RHTEST" && exit 0
+
+DEBUGBUILDSENABLED=$1
+if [ -z "$DEBUGBUILDSENABLED" ]; then
+	exit 1
+fi
+
+if [ -z "$FLAVOR" ]; then
+	FLAVOR=rhel
+fi
+
+if [ "$FLAVOR" = "fedora" ]; then
+	SECONDARY=rhel
+else
+	SECONDARY=fedora
+fi
+
+for i in kernel-rt-*-"$FLAVOR".config; do
+	NEW=kernel-rt-"$SPECVERSION"-$(echo "$i" | cut -d - -f3- | sed s/-"$FLAVOR"//)
+	#echo $NEW
+	mv "$i" "$NEW"
 done
+
+rm -f kernel-rt-*-"$SECONDARY".config
+
+if [ "$DEBUGBUILDSENABLED" -eq 0 ]; then
+	for i in kernel-rt-*debug*.config; do
+		base=$(echo "$i" | sed -r s/-?debug//g)
+		NEW=kernel-rt-$(echo "$base" | cut -d - -f3-)
+		mv "$i" "$NEW"
+	done
+fi

SOURCES/generate_bls_conf.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-set -e
-
-. /etc/os-release
-
-kernelver=$1 && shift
-rootfs=$1 && shift
-variant=$1 && shift
-
-output="${rootfs}/lib/modules/${kernelver}/bls.conf"
-date=$(date -u +%Y%m%d%H%M%S)
-
-if [ "${variant:-5}" = "debug" ]; then
-    debugname=" with debugging"
-    debugid="-debug"
-else
-    debugname=""
-    debugid=""
-fi
-
-cat >${output} <<EOF
-title ${NAME} (${kernelver}) ${VERSION}${debugname}
-version ${kernelver}${debugid}
-linux ${bootprefix}/vmlinuz-${kernelver}
-initrd ${bootprefix}/initramfs-${kernelver}.img
-options \$kernelopts
-id ${ID}-${date}-${kernelver}${debugid}
-grub_users \$grub_users
-grub_arg --unrestricted
-grub_class kernel${variant}
-EOF

SOURCES/kernel-local

@@ -0,0 +1,2 @@
+# This file is intentionally left empty in the stock kernel. Its a nicety
+# added for those wanting to do custom rebuilds with altered config opts.

SOURCES/kernel.sbat.template

@@ -1,2 +0,0 @@
-sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com

SOURCES/kmap.py

@@ -1,874 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-kmap.py - Kernel Source-to-Binary Mapping Tool
-
-DESCRIPTION
-    This tool parses Linux kernel build artifacts (.cmd files, archives) to
-    create a JSON mapping of which source files contribute to which kernel
-    binaries (modules and vmlinux). It supports merging data from multiple
-    kernel build variants (e.g., stock, debug, rt) into a single output
-    file using variant indices to track per-variant mappings.
-
-    Supported RHEL versions: 7, 8, 9, upstream
-
-FEATURES
-    - Parses .cmd files generated by kbuild to extract compilation commands
-    - Supports C (gcc/clang) and Rust (rustc) source files
-    - Handles built-in objects via built-in.o.cmd (RHEL 7), built-in.a
-      (RHEL 8/9), or vmlinux.a (upstream)
-    - Merges multiple kernel variants into single output with variant indices
-    - Maps modules to their containing RPM packages
-
-OUTPUT FORMAT
-    The output is a JSON file with the following structure:
-
-    {
-      "variants": ["stock", "rt", ...],
-      "source-map": {
-        "obj-src": {<object>: {<source>: [<variant_indices>]}},
-        "src-obj": {<source>: {<object>: [<variant_indices>]}}
-      },
-      "module-map": {
-        "module-rpm": {<module>: {<rpm_name>: [<variant_indices>]}},
-        "rpm-modules": {<rpm_name>: {<module>: [<variant_indices>]}}
-      }
-    }
-
-PARSING THE OUTPUT
-    import json
-
-    with open('kernel-map.json') as f:
-        data = json.load(f)
-
-    variants = data['variants']
-    obj_src = data['source-map']['obj-src']
-    src_obj = data['source-map']['src-obj']
-    module_rpm = data['module-map']['module-rpm']
-    rpm_modules = data['module-map']['rpm-modules']
-
-    # Get sources for vmlinux in variant "stock" (index 0)
-    vmlinux_sources = [src for src, indices in obj_src['vmlinux'].items()
-                       if 0 in indices]
-
-    # Find which object a source contributes to
-    fork_objects = [obj for obj, indices in src_obj['kernel/fork.c'].items()
-                    if 0 in indices]
-
-    # Get RPM for a module
-    def get_rpm(module, variant_idx):
-        for rpm, indices in module_rpm.get(module, {}).items():
-            if variant_idx in indices:
-                return rpm
-        return None
-
-USAGE
-    # Single variant
-    ./kmap.py -d /build/stock -r upstream -v stock -o /output
-
-    # Merge multiple variants
-    ./kmap.py -d /build/stock -r upstream -v stock -o /output
-    ./kmap.py -d /build/debug -r upstream -v debug -o /output -i kernel-map.json
-    ./kmap.py -d /build/rt -r upstream -v rt -o /output -i kernel-map.json
-
-    # With module-to-RPM mapping
-    ./kmap.py -d /build -r upstream -v stock -o /output \\
-        --vmlinux-rpm kernel-core-5.14.0.rpm \\
-        --module-list kernel-modules-5.14.0.rpm:modules.list
-
-CREDITS
-    Inspired by gen_compile_commands.py and Joe Lawrence.
-    Time measurement option added for Jan Stancek.
-"""
-
-import re
-import os
-import pathlib
-import json
-import argparse
-import subprocess
-import time
-
-
-# =============================================================================
-# Constants
-# =============================================================================
-
-VMLINUX = 'vmlinux'
-KERNEL_PREFIX = 'kernel/'
-
-# Supported compilers and linkers
-COMPILERS = ('gcc', 'clang')
-LINKER = 'ld'
-RUST_COMPILER = 'rustc'
-
-
-# =============================================================================
-# Regex Patterns
-#
-# These patterns parse the kernel build .cmd files to extract:
-# - What compiler/linker was used
-# - What source files were compiled
-# - What object files were linked
-# =============================================================================
-
-# Pattern for .ko.cmd files (module linking)
-# Matches: cmd_path/to/module.ko := ld <params> -o <ko_name> <input_files>
-# Note: upstream kernels use 'savedcmd_' prefix instead of 'cmd_'
-_KO_CMD_PATTERN = (
-    r'^(saved)?cmd_[^ ]*\.ko\s*:=\s*ld\s+'
-    r'(?P<params>.*) -o (?P<ko_name>\S+) (?P<input_files>[^;]+?)\s*(?:;|$)'
-)
-
-# Pattern for .o.cmd files (object compilation)
-# Matches multiple formats:
-# - C/asm: cmd_*.o := gcc/clang <params> -o <output> <input>
-# - Rust:  cmd_*.o := rustc <params> --emit=obj=<output> <input.rs>
-# - Rust source mapping: source_*.o := <file.rs>
-_O_CMD_PATTERN = (
-    r'^(saved)?(?:cmd_|source_)[^ ]*\.o\s+:=\s+'
-    r'(?:'
-        r'(?P<prefix>(?:\S+=\S+\s+)*)?'
-        r'(?P<command>gcc|clang|ld|rustc)\s+'
-        r'(?P<params>.*?)'
-        r'(?:'
-            r'\s+-o\s+(?P<obj_out>\S+)\s+(?P<input_files>[^;]+?)'
-            r'|'
-            r'\s+--emit=obj=(?P<rust_obj_out>\S+).*?\s+(?P<rust_input_file>\S+\.rs)'
-        r')'
-        r'|'
-        r'(?P<source_file>\S+\.rs)'
-    r')\s*(?:;|$)'
-)
-
-ko_matcher = re.compile(_KO_CMD_PATTERN)
-o_matcher = re.compile(_O_CMD_PATTERN)
-
-
-# =============================================================================
-# Utility Functions
-# =============================================================================
-
-def parse_args():
-    """
-    Parse command line arguments
-    """
-    parser = argparse.ArgumentParser(
-            prog='Kernel Build Mapper',
-            description='Scrape Linux Kernel .cmd files to map contribution '
-                        'of individual source files to kernel binaries.',
-            )
-
-    parser.add_argument('-d', '--directory',
-            help='Directory with kernel build artifacts.',
-            default='',
-            type=str)
-
-    parser.add_argument('-o', '--outputdir',
-            help='Directory where to put generated files.',
-            default='',
-            type=str)
-
-    parser.add_argument('-p', '--prefix',
-            help='Name prefix to the generated files.',
-            default='',
-            type=str)
-
-    parser.add_argument('-r', '--rhel',
-            help='Specify to what version of RHEL artifacts belong (upstream for RHEL 10+/kernel-ark)',
-            choices=['7', '8', '9', 'upstream'],
-            required=True)
-
-    parser.add_argument('-m', '--no-modules',
-            help='*SKIP* collecting information about modules',
-            action='store_true')
-
-    parser.add_argument('-b', '--no-builtin',
-            help='*SKIP* collecting information about built-in',
-            action='store_true')
-
-    parser.add_argument('-t', '--time',
-            help='Print elapsed time at the end',
-            action='store_true')
-
-    parser.add_argument('-v', '--variant',
-            help='Name of this kernel variant (e.g., stock, debug, rt)',
-            required=True,
-            type=str)
-
-    parser.add_argument('-i', '--input',
-            help='Existing JSON file to merge with (from previous variant runs)',
-            default='',
-            type=str)
-
-    parser.add_argument('--module-list',
-            help='Module list in format <rpm-name>:<path> (can be specified multiple times)',
-            action='append',
-            default=[],
-            metavar='RPM:PATH')
-
-    parser.add_argument('--vmlinux-rpm',
-            help='RPM package name for vmlinux (e.g., "kernel-5.14.0.rpm")',
-            default='',
-            type=str)
-
-    return parser.parse_args()
-
-
-def load_file(filename, build_dir=''):
-    """
-    Load a text file and return non-empty lines as a list
-    """
-    full_path = os.path.join(build_dir, filename)
-
-    try:
-        with open(full_path, 'rt', encoding='utf-8') as file:
-            return [line.rstrip() for line in file if line.rstrip()]
-    except FileNotFoundError:
-        print(f'File "{full_path}" not found.')
-        return []
-
-
-def name_to_cmd(filename, suffix):
-    """
-    Convert object filename to corresponding .cmd script filename
-
-    Example: kernel/fork.o -> kernel/.fork.o.cmd
-    """
-    path, _ = os.path.splitext(filename)
-    dirname = os.path.dirname(path)
-    basename = os.path.basename(path)
-
-    return os.path.join(dirname, '.' + basename + suffix)
-
-
-def strip_path_prefixes(path, build_dir):
-    """
-    Normalize path by removing build directory prefix and other artifacts
-    """
-    path = pathlib.Path(path)
-
-    if build_dir:
-        try:
-            return str(path.resolve().relative_to(pathlib.Path(build_dir).resolve()))
-        except ValueError:
-            pass
-
-    if path.is_absolute():
-        path = pathlib.Path(*path.parts[1:])
-
-    while path.parts and path.parts[0] == 'repos':
-        path = pathlib.Path(*path.parts[1:])
-
-    return str(path)
-
-
-def is_external_source(path):
-    """
-    Check if path should be excluded from source mapping
-
-    Filters out:
-    - Rust toolchain sources (not part of kernel source)
-    - Generated assembly files (e.g., initramfs_data.S)
-    """
-    if 'rustlib' in path:
-        return True
-    if path.endswith('_data.S'):
-        return True
-    return False
-
-
-def is_mod_file_reference(ld_input):
-    """
-    Check if linker input is a .mod file reference (RHEL 9+ module linking)
-
-    In RHEL 9+, module linking uses @path/to/module.mod files that contain
-    the list of object files to link.
-    """
-    files = ld_input.split()
-    return len(files) == 1 and files[0].startswith('@') and files[0].endswith('.mod')
-
-
-# =============================================================================
-# SourceMap Class
-# =============================================================================
-
-class SourceMap:
-    """
-    Collects and manages kernel source-to-binary mappings.
-
-    This class parses kernel build artifacts (.cmd files, archives) to determine
-    which source files contribute to which kernel binaries (modules and vmlinux).
-
-    Data structures:
-        obj_to_src: {object_name: {source_file: [variant_indices]}}
-        src_to_obj: {source_file: {object_name: [variant_indices]}}
-        module_rpm: {module_name: {rpm_name: [variant_indices]}}
-        rpm_to_modules: {rpm_name: {module_name: [variant_indices]}}
-
-    Variant indices correspond to positions in the 'variants' list.
-    """
-
-    # Dispatch table for RHEL-specific builtin collection methods
-    BUILTIN_COLLECTORS = {
-        '7': '_collect_builtin_rhel7',
-        '8': '_collect_builtin_archive',
-        '9': '_collect_builtin_archive',
-        'upstream': '_collect_builtin_vmlinux_archive',
-    }
-
-    def __init__(self, build_dir='', output_dir='', outprefix='', rhel='7', variant=''):
-        # Source mappings
-        self.obj_to_src = {}
-        self.src_to_obj = {}
-        # Module-to-RPM mappings
-        self.module_rpm = {}
-        self.rpm_to_modules = {}
-
-        # Configuration
-        self.build_dir = build_dir
-        self.output_dir = output_dir
-        self.outprefix = outprefix
-        self.rhel = rhel
-
-        # Module list
-        self.modlist = set()
-
-        # Variant tracking for multi-variant merging
-        self.variants = []
-        self.variant = variant
-        self.variant_idx = 0
-
-    # -------------------------------------------------------------------------
-    # Variant Management
-    # -------------------------------------------------------------------------
-
-    def load_existing(self, filename):
-        """
-        Load existing merged data from previous variant runs
-        """
-        if not filename:
-            return
-
-        full_path = os.path.join(self.output_dir, filename) if self.output_dir else filename
-
-        if not os.path.exists(full_path):
-            return
-
-        with open(full_path, 'rt', encoding='utf-8') as f:
-            data = json.load(f)
-
-        self.variants = data.get('variants', [])
-
-        module_map = data.get('module-map', {})
-        self.module_rpm = module_map.get('module-rpm', {})
-        self.rpm_to_modules = module_map.get('rpm-modules', {})
-
-        source_map = data.get('source-map', {})
-        self.obj_to_src = source_map.get('obj-src', {})
-        self.src_to_obj = source_map.get('src-obj', {})
-
-    def add_variant(self):
-        """
-        Register current variant and store its index
-        """
-        if self.variant in self.variants:
-            self.variant_idx = self.variants.index(self.variant)
-        else:
-            self.variant_idx = len(self.variants)
-            self.variants.append(self.variant)
-
-    # -------------------------------------------------------------------------
-    # Source Merging Helpers
-    # -------------------------------------------------------------------------
-
-    def _merge_sources(self, target, source):
-        """
-        Merge source dict into target dict by combining variant index lists
-        """
-        for src, indices in source.items():
-            if src not in target:
-                target[src] = []
-            for idx in indices:
-                if idx not in target[src]:
-                    target[src].append(idx)
-
-    def _add_source(self, sources, source_path):
-        """
-        Add a source file to the sources dict with current variant index
-
-        Returns True if source was added, False if filtered out
-        """
-        source_path = os.path.normpath(source_path)
-        source_path = strip_path_prefixes(source_path, self.build_dir)
-
-        if is_external_source(source_path):
-            return False
-
-        sources[source_path] = [self.variant_idx]
-        return True
-
-    # -------------------------------------------------------------------------
-    # .cmd File Parsing
-    # -------------------------------------------------------------------------
-
-    def _parse_ko_cmd(self, ko_name):
-        """
-        Parse .ko.cmd file to find the primary object file linked into the module
-        """
-        ko_script = name_to_cmd(ko_name, '.ko.cmd')
-        lines = load_file(ko_script, build_dir=self.build_dir)
-
-        for line in lines:
-            result = ko_matcher.match(line)
-            if result:
-                input_files = result.group('input_files').split()
-                return input_files[0]
-
-        return None
-
-    def _parse_o_cmd(self, o_name, translate=True):
-        """
-        Parse .o.cmd file to extract source files that contribute to the object
-
-        Handles:
-        - C/assembly compilation (gcc, clang)
-        - Linking (ld) - recursively parses linked objects
-        - Rust compilation (rustc)
-        - Rust source file mappings
-
-        Args:
-            o_name: Object file name or .cmd file path
-            translate: If True, convert object name to .cmd path (e.g., kernel/fork.o
-                       becomes kernel/.fork.o.cmd). If False, use o_name as-is.
-                       This parameter exists to handle different kbuild behaviors
-                       across RHEL versions - some code paths may already have .cmd
-                       paths while others have object names that need translation.
-        """
-        sources = {}
-
-        o_script = name_to_cmd(o_name, '.o.cmd') if translate else o_name
-        lines = load_file(o_script, build_dir=self.build_dir)
-
-        for line in lines:
-            result = o_matcher.match(line)
-            if not result:
-                continue
-
-            command = result.group('command')
-
-            if command in COMPILERS:
-                self._handle_compiler(result, sources)
-                break
-
-            elif command == LINKER:
-                self._handle_linker(result, sources)
-                break
-
-            elif command == RUST_COMPILER:
-                self._handle_rustc(result, sources)
-                break
-
-            else:
-                self._handle_rust_source_mapping(result, sources)
-                break
-
-        return sources
-
-    def _handle_compiler(self, match_result, sources):
-        """
-        Handle gcc/clang compilation - extract the input source file
-        """
-        obj_input = match_result.group('input_files')
-        if obj_input:
-            self._add_source(sources, obj_input)
-
-    def _handle_linker(self, match_result, sources):
-        """
-        Handle ld linking - recursively parse linked objects
-        """
-        obj_input = match_result.group('input_files')
-        if not obj_input:
-            return
-
-        if is_mod_file_reference(obj_input):
-            self._merge_sources(sources, self._parse_mod_cmd(obj_input))
-        else:
-            for obj_file in obj_input.split():
-                self._merge_sources(sources, self._parse_o_cmd(obj_file))
-
-    def _handle_rustc(self, match_result, sources):
-        """
-        Handle rustc compilation - extract the Rust source file
-        """
-        rust_input = match_result.group('rust_input_file')
-        if rust_input:
-            self._add_source(sources, rust_input)
-
-    def _handle_rust_source_mapping(self, match_result, sources):
-        """
-        Handle Rust source file mapping (source_*.o := *.rs)
-        """
-        source_file = match_result.group('source_file')
-        if source_file and source_file.endswith('.rs'):
-            self._add_source(sources, source_file)
-
-    def _parse_mod_cmd(self, mod_name):
-        """
-        Parse .mod file used by RHEL 9+ for linking modules
-
-        These files contain a list of object files to link into the module.
-        """
-        sources = {}
-        mod_name = mod_name.strip('@')
-        lines = load_file(mod_name, build_dir=self.build_dir)
-
-        for line in lines:
-            self._merge_sources(sources, self._parse_o_cmd(line))
-
-        return sources
-
-    def _parse_a_cmd(self, a_name):
-        """
-        Parse archive .cmd file (RHEL 7 built-in.o.cmd files)
-        """
-        sources = {}
-        lines = load_file(a_name, build_dir=self.build_dir)
-
-        for line in lines:
-            result = o_matcher.match(line)
-            if not result:
-                continue
-
-            ar_input = result.group('input_files')
-            for filename in ar_input.rsplit():
-                if filename.endswith('.o'):
-                    self._merge_sources(sources, self._parse_o_cmd(filename))
-                elif filename.endswith('.a'):
-                    self._merge_sources(sources, self._parse_a_cmd(filename))
-
-        return sources
-
-    # -------------------------------------------------------------------------
-    # Module Collection
-    # -------------------------------------------------------------------------
-
-    def _load_module_list(self, modorder='modules.order'):
-        """
-        Load modules.order file and normalize paths
-
-        RHEL 7, 8: modules.order has 'kernel/' prefix that needs to be stripped
-        RHEL 9, upstream: modules.order paths are used as-is
-        """
-        lines = load_file(modorder, build_dir=self.build_dir)
-
-        if not lines:
-            print(f'Warning: modules.order is empty or not found')
-            self.modlist = set()
-            return
-
-        if self.rhel in ['9', 'upstream']:
-            self.modlist = set(lines)
-        else:
-            # RHEL 7, 8: strip fake 'kernel/' prefix added by kbuild
-            self.modlist = {
-                path[len(KERNEL_PREFIX):] if path.startswith(KERNEL_PREFIX) else path
-                for path in lines
-            }
-
-    def _parse_module_objects(self):
-        """
-        Parse all module .cmd files and extract source mappings.
-
-        Note on RHEL version differences:
-        - RHEL 7/8/9: modules.order contains .ko paths (e.g., fs/exfat/exfat.ko)
-        - upstream: modules.order contains .o paths (e.g., fs/exfat/exfat.o)
-
-        The normalization below ensures consistent .ko keys in output regardless
-        of the modules.order format.
-        """
-        for kobj in self.modlist:
-            # Normalize to .ko - upstream has .o paths in modules.order
-            if self.rhel == 'upstream' and kobj.endswith('.o'):
-                module_name = kobj[:-2] + '.ko'
-            else:
-                module_name = kobj
-
-            obj_name = self._parse_ko_cmd(module_name)
-            if obj_name is None:
-                print(f'Warning: Could not parse .ko.cmd for "{module_name}", skipping.')
-                continue
-
-            obj_source = self._parse_o_cmd(obj_name)
-            if module_name not in self.obj_to_src:
-                self.obj_to_src[module_name] = {}
-            self._merge_sources(self.obj_to_src[module_name], obj_source)
-
-    def collect_modules(self, no_modules=False, modorder='modules.order'):
-        """
-        Collect source files for kernel modules
-        """
-        if no_modules:
-            return
-
-        self._load_module_list(modorder)
-        self._parse_module_objects()
-
-    # -------------------------------------------------------------------------
-    # Builtin Collection (RHEL version-specific)
-    # -------------------------------------------------------------------------
-
-    def _collect_builtin_rhel7(self):
-        """
-        Collect built-in objects for RHEL 7 using *built-in.o.cmd files
-        """
-        pattern = '*built-in.o.cmd'
-        cmd_list = {
-            strip_path_prefixes(path, self.build_dir)
-            for path in pathlib.Path(self.build_dir).rglob(pattern)
-        }
-
-        for entry in cmd_list:
-            sources = self._parse_a_cmd(entry)
-            self._merge_sources(self.obj_to_src[VMLINUX], sources)
-
-    def _collect_builtin_archive(self):
-        """
-        Collect built-in objects for RHEL 8/9 using *built-in.a archives
-        """
-        pattern = '*built-in.a'
-        archive_list = {
-            strip_path_prefixes(path, self.build_dir)
-            for path in pathlib.Path(self.build_dir).rglob(pattern)
-        }
-
-        for entry in archive_list:
-            path = os.path.join(self.build_dir, entry)
-            objects = subprocess.check_output(['ar', 't', path]).decode().split()
-
-            for obj in objects:
-                obj_path = strip_path_prefixes(obj, build_dir=self.build_dir)
-                sources = self._parse_o_cmd(obj_path)
-                self._merge_sources(self.obj_to_src[VMLINUX], sources)
-
-    def _collect_builtin_vmlinux_archive(self):
-        """
-        Collect built-in objects for upstream kernels using single vmlinux.a archive
-        """
-        path = os.path.join(self.build_dir, 'vmlinux.a')
-        objects = subprocess.check_output(['ar', 't', path]).decode().split()
-
-        for obj in objects:
-            obj_path = strip_path_prefixes(obj, build_dir=self.build_dir)
-            sources = self._parse_o_cmd(obj_path)
-            self._merge_sources(self.obj_to_src[VMLINUX], sources)
-
-    def collect_builtin(self, no_builtin=False):
-        """
-        Collect source files for vmlinux built-in objects
-
-        Uses RHEL version-specific collection method via dispatch table.
-        """
-        if VMLINUX not in self.obj_to_src:
-            self.obj_to_src[VMLINUX] = {}
-
-        if no_builtin:
-            return
-
-        collector_name = self.BUILTIN_COLLECTORS.get(self.rhel, '_collect_builtin_archive')
-        collector = getattr(self, collector_name)
-        collector()
-
-    # -------------------------------------------------------------------------
-    # Module-to-RPM Mapping
-    # -------------------------------------------------------------------------
-
-    def _parse_module_list_file(self, filename, rpm_name):
-        """
-        Parse a module list file and add entries to module_rpm mapping
-
-        Handles various formats:
-        - Absolute paths: /lib/modules/5.14.0/kernel/drivers/net/e1000.ko.xz
-        - Relative paths: kernel/drivers/net/e1000.ko
-        - Skips RPM spec directives (%dir, %defattr, etc.)
-
-        Args:
-            filename: Path to the module list file
-            rpm_name: Literal RPM package name (e.g., "kernel-modules-5.14.0.rpm")
-        """
-        if not filename or not os.path.exists(filename):
-            return
-
-        with open(filename, 'rt', encoding='utf-8') as f:
-            for line in f:
-                line = line.strip()
-
-                # Skip empty lines, comments, and RPM spec directives
-                if not line or line.startswith('#') or line.startswith('%'):
-                    continue
-
-                # Skip non-module files
-                if '.ko' not in line:
-                    continue
-
-                # Extract module name from path
-                module = os.path.basename(line)
-                # Remove .ko and any compression suffix
-                module = re.sub(r'\.ko(\.[^.]+)?$', '', module)
-
-                if not module:
-                    continue
-
-                if module not in self.module_rpm:
-                    self.module_rpm[module] = {}
-
-                if rpm_name not in self.module_rpm[module]:
-                    self.module_rpm[module][rpm_name] = []
-                if self.variant_idx not in self.module_rpm[module][rpm_name]:
-                    self.module_rpm[module][rpm_name].append(self.variant_idx)
-
-    def collect_module_rpm(self, module_lists, vmlinux_rpm=''):
-        """
-        Collect module-to-RPM name mappings from module list files
-
-        Args:
-            module_lists: List of "rpm_name:path" strings
-            vmlinux_rpm: RPM package name for vmlinux
-        """
-        if not module_lists and not vmlinux_rpm:
-            return
-
-        # Add vmlinux to specified RPM
-        if vmlinux_rpm:
-            if VMLINUX not in self.module_rpm:
-                self.module_rpm[VMLINUX] = {}
-            if vmlinux_rpm not in self.module_rpm[VMLINUX]:
-                self.module_rpm[VMLINUX][vmlinux_rpm] = []
-            if self.variant_idx not in self.module_rpm[VMLINUX][vmlinux_rpm]:
-                self.module_rpm[VMLINUX][vmlinux_rpm].append(self.variant_idx)
-
-        # Process module list files
-        for entry in module_lists:
-            if ':' not in entry:
-                print(f'Warning: Invalid --module-list format "{entry}", expected RPM:PATH')
-                continue
-
-            rpm_name, path = entry.split(':', 1)
-            self._parse_module_list_file(path, rpm_name)
-
-    # -------------------------------------------------------------------------
-    # Output
-    # -------------------------------------------------------------------------
-
-    def _build_reverse_map(self):
-        """
-        Create reverse mapping (source -> {obj: [indices]}) from obj_to_src
-        """
-        for obj, sources in self.obj_to_src.items():
-            for source, indices in sources.items():
-                if source not in self.src_to_obj:
-                    self.src_to_obj[source] = {}
-                if obj not in self.src_to_obj[source]:
-                    self.src_to_obj[source][obj] = []
-                for idx in indices:
-                    if idx not in self.src_to_obj[source][obj]:
-                        self.src_to_obj[source][obj].append(idx)
-
-    def _build_rpm_reverse_map(self):
-        """
-        Create reverse mapping (rpm -> {module: [indices]}) from module_rpm
-        """
-        for module, rpms in self.module_rpm.items():
-            for rpm, indices in rpms.items():
-                if rpm not in self.rpm_to_modules:
-                    self.rpm_to_modules[rpm] = {}
-                if module not in self.rpm_to_modules[rpm]:
-                    self.rpm_to_modules[rpm][module] = []
-                for idx in indices:
-                    if idx not in self.rpm_to_modules[rpm][module]:
-                        self.rpm_to_modules[rpm][module].append(idx)
-
-    def save_data(self):
-        """
-        Save collected data to JSON file
-
-        Output structure:
-          - variants: list of variant names
-          - source-map: source file mappings
-            - obj-src: object/module -> {source: [variant_indices]}
-            - src-obj: source -> {object/module: [variant_indices]}
-          - module-map: module to RPM mappings
-            - module-rpm: module name -> {rpm-name: [variant_indices]}
-            - rpm-modules: rpm-name -> {module name: [variant_indices]}
-
-        Variant indices correspond to positions in the 'variants' list.
-        """
-        output = {
-            'variants': self.variants,
-            'source-map': {
-                'obj-src': self.obj_to_src,
-                'src-obj': self.src_to_obj
-            },
-            'module-map': {
-                'module-rpm': self.module_rpm,
-                'rpm-modules': self.rpm_to_modules
-            }
-        }
-
-        filename = self.outprefix + 'kernel-map.json'
-        with open(os.path.join(self.output_dir, filename), 'wt', encoding='utf-8') as f:
-            json.dump(output, f, indent=2, sort_keys=True)
-
-    # -------------------------------------------------------------------------
-    # Main Entry Point
-    # -------------------------------------------------------------------------
-
-    def collect_data(self, no_modules=False, no_builtin=False, modorder='modules.order',
-                     input_file='', module_lists=None, vmlinux_rpm=''):
-        """
-        Main entry point - collect all data and save to JSON
-        """
-        self.load_existing(input_file)
-        self.add_variant()
-        self.collect_modules(no_modules, modorder)
-        self.collect_builtin(no_builtin)
-        self.collect_module_rpm(module_lists or [], vmlinux_rpm)
-        self._build_reverse_map()
-        self._build_rpm_reverse_map()
-        self.save_data()
-
-
-# =============================================================================
-# Main
-# =============================================================================
-
-def main():
-    """
-    Main entry point
-    """
-    args = parse_args()
-
-    start = time.monotonic()
-
-    source_map = SourceMap(
-            build_dir=args.directory,
-            output_dir=args.outputdir,
-            outprefix=args.prefix,
-            rhel=args.rhel,
-            variant=args.variant)
-
-    source_map.collect_data(
-            no_modules=args.no_modules,
-            no_builtin=args.no_builtin,
-            input_file=args.input,
-            module_lists=args.module_list,
-            vmlinux_rpm=args.vmlinux_rpm)
-
-    if args.time:
-        elapsed = time.monotonic() - start
-        minutes, seconds = divmod(int(elapsed), 60)
-        print(f'Elapsed time: {minutes:02d}:{seconds:02d}')
-
-
-if __name__ == '__main__':
-    main()

SOURCES/merge.pl

@@ -0,0 +1,72 @@
+#! /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;

SOURCES/mod-denylist.sh

@@ -1,4 +1,5 @@
 #! /bin/bash
+# shellcheck disable=SC2164
 
 RpmDir=$1
 ModDir=$2
@@ -24,9 +25,9 @@ __EOF__
 
 check_blacklist()
 {
-	mod=$(find $RpmDir/$ModDir -name "$1")
+	mod=$(find "$RpmDir/$ModDir" -name "$1")
 	[ ! "$mod" ] && return 0
-	if modinfo $mod | grep -q '^alias:\s\+net-'; then
+	if modinfo "$mod" | grep -q '^alias:\s\+net-'; then
 		mod="${1##*/}"
 		mod="${mod%.ko*}"
 		echo "$mod has an alias that allows auto-loading. Blacklisting."
@@ -37,7 +38,7 @@ check_blacklist()
 find_depends()
 {
 	dep=$1
-	depends=`modinfo $dep | sed -n -e "/^depends/ s/^depends:[ \t]*//p"`
+	depends=$(modinfo "$dep" | sed -n -e "/^depends/ s/^depends:[ \t]*//p")
 	[ -z "$depends" ] && exit
 	for mod in ${depends//,/ }
 	do
@@ -45,14 +46,14 @@ find_depends()
 		[ -z "$match" ] && continue
 		# check if the module we are looking at is in mod-* too.
 		# if so we do not need to mark the dep as required.
-		mod2=${dep##*/}  # same as `basename $dep`, but faster
+		mod2=${dep##*/}  # same as $(basename $dep), but faster
 		match2=$(grep "^$mod2" "$ListName")
 		if [ -n "$match2" ]
 		then
 			#echo $mod2 >> notreq.list
 			continue
 		fi
-		echo $mod.ko >> req.list
+		echo "$mod".ko >> req.list
 	done
 }
 
@@ -60,11 +61,11 @@ foreachp()
 {
 	P=$(nproc)
 	bgcount=0
-	while read mod; do
+	while read -r mod; do
 		$1 "$mod" &
 
 		bgcount=$((bgcount + 1))
-		if [ $bgcount -eq $P ]; then
+		if [ $bgcount -eq "$P" ]; then
 			wait -n
 			bgcount=$((bgcount - 1))
 		fi
@@ -76,12 +77,12 @@ foreachp()
 # Destination was specified on the command line
 test -n "$4" && echo "$0: Override Destination $Dest has been specified."
 
-pushd $Dir
+pushd "$Dir"
 
-OverrideDir=$(basename $List)
+OverrideDir=$(basename "$List")
 OverrideDir=${OverrideDir%.*}
 OverrideDir=${OverrideDir#*-}
-mkdir -p $OverrideDir
+mkdir -p "$OverrideDir"
 
 rm -rf modnames
 find . -name "*.ko" -type f > modnames
@@ -94,7 +95,8 @@ cp "$List" .
 
 # This variable needs to be exported because it is used in sub-script
 # executed by xargs
-export ListName=$(basename "$List")
+ListName=$(basename "$List")
+export ListName
 
 foreachp find_depends < modnames
 
@@ -102,25 +104,25 @@ sort -u req.list > req2.list
 sort -u "$ListName" > modules2.list
 join -v 1 modules2.list req2.list > modules3.list
 
-for mod in $(cat modules3.list)
+while IFS= read -r mod
 do
     # get the path for the module
-  modpath=`grep /$mod modnames`
+    modpath=$(grep /"$mod" modnames)
     [ -z "$modpath" ] && continue
-  echo $modpath >> dep.list
+    echo "$modpath" >> dep.list
-done
+done < modules3.list
 
 sort -u dep.list > dep2.list
 
 if [ -n "$Dest" ]; then
     # now move the modules into the $Dest directory
-	for mod in `cat dep2.list`
+    while IFS= read -r mod
     do
-	  newpath=`dirname $mod | sed -e "s/kernel\\//$Dest\//"`
+	newpath=$(dirname "$mod" | sed -e "s/kernel\\//$Dest\//")
-	  mkdir -p $newpath
+	mkdir -p "$newpath"
-	  mv $mod $newpath
+	mv "$mod" "$newpath"
-	  echo $mod | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> $RpmDir/$ListName
+	echo "$mod" | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> "$RpmDir"/"$ListName"
-	done
+    done < dep2.list
 fi
 
 popd
@@ -130,23 +132,33 @@ popd
 # target doesn't try to sign a non-existent file.  This is kinda ugly, but
 # so are the modules-* packages.
 
-for mod in `cat ${Dir}/dep2.list`
+while IFS= read -r mod
 do
-  modfile=`basename $mod | sed -e 's/.ko/.mod/'`
+  modfile=$(basename "$mod" | sed -e 's/.ko/.mod/')
-  rm .tmp_versions/$modfile
+  rm .tmp_versions/"$modfile"
-done
+done < "$Dir"/dep2.list
 
-if [ ! -n "$Dest" ]; then
+if [ -z "$Dest" ]; then
-	sed -e "s|^.|${ModDir}|g" ${Dir}/dep2.list > $RpmDir/$ListName
+	sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
 	echo "./$RpmDir/$ListName created."
 	[ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/"
-	foreachp check_blacklist < $List
+	foreachp check_blacklist < "$List"
+fi
+
+# Many BIOS-es export a PNP-id which causes the floppy driver to autoload
+# even though most modern systems don't have a 3.5" floppy driver anymore
+# this replaces the old die_floppy_die.patch which removed the PNP-id from
+# the module
+
+floppylist=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*)
+if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then
+     blacklist "floppy"
 fi
 
 # avoid an empty kernel-extra package
-echo "$ModDir/$OverrideDir" >> $RpmDir/$ListName
+echo "$ModDir/$OverrideDir" >> "$RpmDir/$ListName"
 
-pushd $Dir
+pushd "$Dir"
 rm modnames dep.list dep2.list req.list req2.list
 rm "$ListName" modules2.list modules3.list
 popd

SOURCES/mod-extra.list.rhel

@@ -2,8 +2,6 @@
 a3d.ko
 act200l-sir.ko
 actisys-sir.ko
-act_mpls.ko
-act_ct.ko
 adi.ko
 aer_inject.ko
 af_802154.ko
@@ -17,7 +15,6 @@ avm_cs.ko
 avmfritz.ko
 ax25.ko
 b1.ko
-bareudp.ko
 bas_gigaset.ko
 batman-adv.ko
 baycom_par.ko
@@ -72,7 +69,6 @@ iforce.ko
 interact.ko
 ipddp.ko
 ipx.ko
-ip_vs_mh.ko
 isdn.ko
 joydump.ko
 kingsun-sir.ko
@@ -83,6 +79,7 @@ l2tp_core.ko
 l2tp_debugfs.ko
 l2tp_eth.ko
 l2tp_ip.ko
+l2tp_ip6.ko
 l2tp_netlink.ko
 l2tp_ppp.ko
 lec.ko
@@ -124,11 +121,9 @@ rds_tcp.ko
 rose.ko
 sch_atm.ko
 sch_cbq.ko
-sch_cbs.ko
 sch_choke.ko
 sch_drr.ko
 sch_dsmark.ko
-sch_ets.ko
 sch_gred.ko
 sch_mqprio.ko
 sch_multiq.ko
@@ -139,6 +134,7 @@ sch_sfb.ko
 sch_teql.ko
 sctp.ko
 sctp_diag.ko
+sctp_probe.ko
 sidewinder.ko
 sja1000.ko
 sja1000_platform.ko
@@ -192,7 +188,5 @@ wanrouter.ko
 warrior.ko
 whci.ko
 wire.ko
-xpad.ko
-xt_u32.ko
 yam.ko
 zhenhua.ko

SOURCES/mod-internal.list

@@ -13,34 +13,19 @@ qos-test
 resource_kunit
 soc-topology-test
 soc-utils-test
-stackinit_kunit
 string-stream-test
 test_linear_ranges
 test_bits
 test_kasan
+time_test
 fat_test
+lib_test
+rational-test
 test_list_sort
 slub_kunit
 memcpy_kunit
-time_test
-drm_format_helper_test
-drm_damage_helper_test
-drm_cmdline_parser_test
-drm_kunit_helpers
-drm_rect_test
-drm_format_test
-drm_plane_helper_test
-drm_dp_mst_helper_test
-drm_framebuffer_test
-drm_buddy_test
-drm_mm_test
-drm_connector_test
-drm_managed_test
-drm_modes_test
-drm_probe_helper_test
-lib_test
 dev_addr_lists_test
-rational-test
+kfence_test
 test_hash
 locktorture
 mac80211_hwsim
@@ -49,8 +34,6 @@ pktgen
 rcutorture
 rocker
 scftorture
-torture
-test_bpf
 test_klp_atomic_replace
 test_klp_callbacks_demo
 test_klp_callbacks_demo2
@@ -61,6 +44,21 @@ test_klp_shadow_vars
 test_klp_state
 test_klp_state2
 test_klp_state3
+torture
+refscale
+rcuscale
+memcpy_kunit
+dev_addr_lists_test
+test_hash
+test_bpf
+stackinit_kunit
+overflow_kunit
+clk-gate_test
+clk_test
+mtty
 test_hmm
 test_vmalloc
-mtty
+test_cpumask
+iio-test-format
+iio-test-rescale
+cros_kunit

SOURCES/mod-partner.list

@@ -0,0 +1,2 @@
+afs
+rxrpc

SOURCES/mod-sign.sh

@@ -2,7 +2,7 @@
 
 # The modules_sign target checks for corresponding .o files for every .ko that
 # is signed. This doesn't work for package builds which re-use the same build
-# directory for every flavour, and the .config may change between flavours.
+# directory for every variant, and the .config may change between variants.
 # So instead of using this script to just sign lib/modules/$KernelVer/extra,
 # sign all .ko in the buildroot.
 
@@ -13,9 +13,9 @@ MODSECKEY=$1
 MODPUBKEY=$2
 moddir=$3
 
-modules=`find $moddir -type f -name '*.ko'`
+modules=$(find "$moddir" -type f -name '*.ko')
 
-NPROC=`nproc`
+NPROC=$(nproc)
 [ -z "$NPROC" ] && NPROC=1
 
 # NB: this loop runs 2000+ iterations. Try to be fast.
@@ -27,7 +27,7 @@ done
 " DUMMYARG0   # xargs appends ARG1 ARG2..., which go into $mod in for loop.
 
 RANDOMMOD=$(echo "$modules" | sort -R | head -n 1)
-if [ "~Module signature appended~" != "$(tail -c 28 $RANDOMMOD)" ]; then
+if [ "~Module signature appended~" != "$(tail -c 28 "$RANDOMMOD")" ]; then
     echo "*****************************"
     echo "*** Modules are unsigned! ***"
     echo "*****************************"

SOURCES/parallel_xz.sh

@@ -23,4 +23,4 @@ test "$procgroup" = 1 && exec xargs -r xz
 # xz has some startup cost. If files are really small,
 # this cost might be significant. To combat this,
 # process several files (in sequence) by each xz process via -n 16:
-exec xargs -r -n 16 -P $procgroup xz
+exec xargs -r -n 16 -P "$procgroup" xz

SOURCES/partial-kgcov-snip.config

@@ -0,0 +1,5 @@
+# kgcov
+CONFIG_GCOV_KERNEL=y
+CONFIG_GCOV_PROFILE_ALL=y
+# CONFIG_GCOV_PROFILE_FTRACE is not set
+# CONFIG_OPEN_DICE is not set

SOURCES/process_configs.sh

@@ -3,14 +3,27 @@
 # This script takes the merged config files and processes them through oldconfig
 # and listnewconfig
 #
+# Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands
+# shellcheck disable=SC2164
+
+test -n "$RHTEST" && exit 0
 
 usage()
 {
-	echo "process_configs.sh [ -n|-c|-t ] package_name kernel_version [cross_opts]"
+	# alphabetical order please
-	echo "     -n: error on unset config options"
+	echo "process_configs.sh [ options ] package_name kernel_version"
+	echo "     -a: report all errors, equivalent to [-c -n -w -i]"
 	echo "     -c: error on mismatched config options"
+	echo "     -i: continue on error"
+	echo "     -n: error on unset config options"
 	echo "     -t: test run, do not overwrite original config"
 	echo "     -w: error on misconfigured config options"
+	echo "     -z: commit new configs to pending directory"
+	echo ""
+	echo "     A special CONFIG file tag, process_configs_known_broken can be added as a"
+	echo "     comment to any CONFIG file.  This tag indicates that there is no way to "
+	echo "     fix a CONFIG's entry.  This tag should only be used in extreme cases"
+	echo "     and is not to be used as a workaround to solve CONFIG problems."
 	exit 1
 }
 
@@ -20,18 +33,27 @@ die()
 	exit 1
 }
 
+get_cross_compile()
+{
+	arch=$1
+	if [[ "$CC_IS_CLANG" -eq 1 ]]; then
+		echo "$arch"
+	else
+		echo "scripts/dummy-tools/"
+	fi
+}
+
 # stupid function to find top of tree to do kernel make configs
 switch_to_toplevel()
 {
 	path="$(pwd)"
 	while test -n "$path"
 	do
-		test -d $path/firmware && \
+		test -e "$path"/MAINTAINERS && \
-			test -e $path/MAINTAINERS && \
+			test -d "$path"/drivers && \
-			test -d $path/drivers && \
 			break
 
-		path="$(dirname $path)"
+		path=$(dirname "$path")
 	done
 
 	test -n "$path"  || die "Can't find toplevel"
@@ -40,6 +62,9 @@ switch_to_toplevel()
 
 checkoptions()
 {
+	count=$3
+	variant=$4
+
 	/usr/bin/awk '
 
 		/is not set/ {
@@ -62,114 +87,324 @@ checkoptions()
 					 print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
 			}
 		}
-	' $1 $2 > .mismatches
+	' "$1" "$2" > .mismatches"${count}"
 
-	if test -s .mismatches
+	checkoptions_error=false
+	if test -s .mismatches"${count}"
 	then
-		echo "Error: Mismatches found in configuration files"
+		while read -r LINE
-		cat .mismatches
+		do
-		exit 1
+			if find "${REDHAT}"/configs -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then
+				# This is a known broken config.
+				# See script help warning.
+				checkoptions_error=false
+			else
+				checkoptions_error=true
+				break
 			fi
+		done < .mismatches"${count}"
+
+		! $checkoptions_error && return
+
+		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}"
+	else
+		rm -f .mismatches"${count}"
+	fi
+}
+
+parsenewconfigs()
+{
+	tmpdir=$(mktemp -d)
+
+	# This awk script reads the output of make listnewconfig
+	# and puts it into CONFIG_FOO files. Using the output of
+	# listnewconfig is much easier to ensure we get the default
+	# output.
+        /usr/bin/awk -v BASE="$tmpdir" '
+                /is not set/ {
+                        split ($0, a, "#");
+                        split(a[2], b);
+                        OUT_FILE=BASE"/"b[1];
+                        print $0 >> OUT_FILE;
+                }
+
+                /=/     {
+                        split ($0, a, "=");
+                        OUT_FILE=BASE"/"a[1];
+                        if (a[2] == "n")
+                                print "# " a[1] " is not set" >> OUT_FILE;
+                        else
+                                print $0 >> OUT_FILE;
+                }
+
+        ' .newoptions
+
+	# This awk script parses the output of helpnewconfig.
+	# Each option is separated between ----- markers
+	# The goal is to put all the help text as a comment in
+	# each CONFIG_FOO file. Because of how awk works
+	# there's a lot of moving files around and catting to
+	# get what we need.
+        /usr/bin/awk -v BASE="$tmpdir" '
+                BEGIN { inpatch=0;
+			outfile="none";
+                        symbol="none"; }
+                /^Symbol: .*$/ {
+                        split($0, a, " ");
+                        symbol="CONFIG_"a[2];
+                        outfile=BASE "/fake_"symbol
+                }
+                /-----/ {
+			if (inpatch == 0) {
+				inpatch = 1;
+			}
+                        else {
+                                if (symbol != "none") {
+                                    system("cat " outfile " " BASE "/" symbol " > " BASE "/tmpf");
+                                    system("mv " BASE "/tmpf " BASE "/" symbol);
+                                    symbol="none"
+				}
+                                outfile="none"
+				inpatch = 0;
+                        }
+                }
+                !/-----/ {
+                        if (inpatch == 1 && outfile != "none") {
+                                print "# "$0 >> outfile;
+                        }
+                }
+
+
+        ' .helpnewconfig
+
+	pushd "$tmpdir" &> /dev/null
+	rm fake_*
+	popd &> /dev/null
+	for f in "$tmpdir"/*; do
+		[[ -e "$f" ]] || break
+		cp "$f" "$SCRIPT_DIR/pending$FLAVOR/generic/"
+	done
+
+	rm -rf "$tmpdir"
+}
+
+function commit_new_configs()
+{
+	# assume we are in $source_tree/configs, need to get to top level
+	pushd "$(switch_to_toplevel)" &>/dev/null
+
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
+	do
+		arch=$(head -1 "$cfg" | cut -b 3-)
+		cfgtmp="${cfg}.tmp"
+		cfgorig="${cfg}.orig"
+		cat "$cfg" > "$cfgorig"
+
+		if [ "$arch" = "EMPTY" ]
+		then
+			# This arch is intentionally left blank
+			continue
+		fi
+		echo -n "Checking for new configs in $cfg ... "
+
+		# shellcheck disable=SC2086
+		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
+		grep -E 'CONFIG_' .listnewconfig > .newoptions
+		if test -s .newoptions
+		then
+		# shellcheck disable=SC2086
+			make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
+			parsenewconfigs
+		fi
+		rm .newoptions
+		echo "done"
+	done
+
+	git add "$SCRIPT_DIR/pending$FLAVOR"
+	git commit -m "[redhat] AUTOMATIC: New configs"
+}
+
+function process_config()
+{
+	local cfg
+	local arch
+	local cfgtmp
+	local cfgorig
+	local count
+	local variant
+
+	cfg=$1
+	count=$2
+
+	arch=$(head -1 "$cfg" | cut -b 3-)
+
+	if [ "$arch" = "EMPTY" ]
+	then
+		# This arch is intentionally left blank
+		return
+	fi
+
+	variant=$(basename "$cfg" | cut -d"-" -f3- | cut -d"." -f1)
+
+	cfgtmp="${cfg}.tmp"
+	cfgorig="${cfg}.orig"
+	cat "$cfg" > "$cfgorig"
+
+	echo "Processing $cfg ... "
+
+	# shellcheck disable=SC2086
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig"${count}"
+	grep -E 'CONFIG_' .listnewconfig"${count}" > .newoptions"${count}"
+	if test -n "$NEWOPTIONS" && test -s .newoptions"${count}"
+	then
+		echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
+		cat .newoptions"${count}" >> .errors"${count}"
+		rm .newoptions"${count}"
+		RETURNCODE=1
+	fi
+	rm -f .newoptions"${count}"
+
+	grep -E 'config.*warning' .listnewconfig"${count}" > .warnings"${count}"
+	if test -n "$CHECKWARNINGS" && test -s .warnings"${count}"
+	then
+		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
+		cat .warnings"${count}" >> .errors"${count}"
+	fi
+	rm .warnings"${count}"
+
+	rm .listnewconfig"${count}"
+
+	# shellcheck disable=SC2086
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
+	echo "# $arch" > "$cfgtmp"
+	cat "$cfgorig" >> "$cfgtmp"
+	if test -n "$CHECKOPTIONS"
+	then
+		checkoptions "$cfg" "$cfgtmp" "$count" "$variant"
+	fi
+	# if test run, don't overwrite original
+	if test -n "$TESTRUN"
+	then
+		rm -f "$cfgtmp"
+	else
+		mv "$cfgtmp" "$cfg"
+	fi
+	rm -f "$cfgorig"
+	echo "Processing $cfg complete"
 }
 
 function process_configs()
 {
 	# assume we are in $source_tree/configs, need to get to top level
-	pushd $(switch_to_toplevel) &>/dev/null
+	pushd "$(switch_to_toplevel)" &>/dev/null
 
-	for cfg in $SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}*.config
+	# The next line is throwaway code for transition to parallel
+	# processing.  Leaving this line in place is harmless, but it can be
+	# removed the next time anyone updates this function.
+	[ -f .mismatches ] && rm -f .mismatches
+
+	count=0
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
 	do
-		arch=$(head -1 $cfg | cut -b 3-)
+		if [ "$count" -eq 0 ]; then
-		cfgtmp="${cfg}.tmp"
+			# do the first one by itself so that tools are built
-		cfgorig="${cfg}.orig"
+			process_config "$cfg" "$count"
-		cat $cfg > $cfgorig
-
-		echo -n "Processing $cfg ... "
-
-		make ARCH=$arch ${CROSSOPTS} KCONFIG_CONFIG=$cfgorig listnewconfig >& .listnewconfig
-		grep -E 'CONFIG_' .listnewconfig > .newoptions
-		if test -n "$NEWOPTIONS" && test -s .newoptions
-		then
-			echo "Found unset config items, please set them to an appropriate value"
-			cat .newoptions
-			rm .newoptions
-			exit 1
 		fi
-		rm .newoptions
+		process_config "$cfg" "$count" &
-
+		waitpids[${count}]=$!
-		grep -E 'config.*warning' .listnewconfig > .warnings
+		((count++))
-		if test -n "$CHECKWARNINGS" && test -s .warnings
+		while [ "$(jobs | grep -c Running)" -ge "$RHJOBS" ]; do :; done
-		then
-			echo "Found misconfigured config items, please set them to an appropriate value"
-			cat .warnings
-			rm .warnings
-			exit 1
-		fi
-		rm .warnings
-
-		rm .listnewconfig
-
-		make ARCH=$arch ${CROSSOPTS} KCONFIG_CONFIG=$cfgorig oldnoconfig > /dev/null || exit 1
-		echo "# $arch" > ${cfgtmp}
-		cat "${cfgorig}" >> ${cfgtmp}
-		if test -n "$CHECKOPTIONS"
-		then
-			checkoptions $cfg $cfgtmp
-		fi
-		# if test run, don't overwrite original
-		if test -n "$TESTRUN"
-		then
-			rm ${cfgtmp}
-		else
-			mv ${cfgtmp} ${cfg}
-		fi
-		rm ${cfgorig}
-		echo "done"
 	done
+	for pid in ${waitpids[*]}; do
+		wait ${pid}
+	done
+
 	rm "$SCRIPT_DIR"/*.config*.old
+
+	if ls .errors* 1> /dev/null 2>&1; then
+		RETURNCODE=1
+		cat .errors*
+		rm .errors* -f
+	fi
+	if ls .mismatches* 1> /dev/null 2>&1; then
+		RETURNCODE=1
+		cat .mismatches*
+		rm .mismatches* -f
+	fi
+
 	popd > /dev/null
 
-	echo "Processed config files are in $SCRIPT_DIR"
+	[ $RETURNCODE -eq 0 ] && echo "Processed config files are in $SCRIPT_DIR"
 }
 
-NEWOPTIONS=""
 CHECKOPTIONS=""
-CHECKWARNINGS=""
+NEWOPTIONS=""
 TESTRUN=""
+CHECKWARNINGS=""
+MAKEOPTS=""
+CC_IS_CLANG=0
+
+RETURNCODE=0
 
 while [[ $# -gt 0 ]]
 do
 	key="$1"
 	case $key in
+		-a)
+			CHECKOPTIONS="x"
+			NEWOPTIONS="x"
+			CHECKWARNINGS="x"
+			;;
+		-c)
+			CHECKOPTIONS="x"
+			;;
 		-h)
 			usage
 			;;
 		-n)
 			NEWOPTIONS="x"
 			;;
-		-c)
-			CHECKOPTIONS="x"
-			;;
 		-t)
 			TESTRUN="x"
 			;;
 		-w)
 			CHECKWARNINGS="x"
 			;;
+		-z)
+			COMMITNEWCONFIGS="x"
+			;;
+		-m)
+			shift
+			if [ "$1" = "CC=clang" ] || [ "$1" = "LLVM=1" ]; then
+				CC_IS_CLANG=1
+			fi
+			MAKEOPTS="$MAKEOPTS $1"
+			;;
 		*)
 			break;;
 	esac
 	shift
 done
 
-PACKAGE_NAME="${1:-kernel}" # defines the package name used
+KVERREL="$(test -n "$1" && echo "-$1" || echo "")"
-KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
+FLAVOR="$(test -n "$2" && echo "-$2" || echo "-ark")"
-CROSSOPTS="$3"
+# shellcheck disable=SC2015
-SCRIPT="$(readlink -f $0)"
+SCRIPT=$(readlink -f "$0")
-OUTPUT_DIR="$PWD"
+SCRIPT_DIR=$(dirname "$SCRIPT")
-SCRIPT_DIR="$(dirname $SCRIPT)"
+
+# Config options for RHEL should target the pending-ark directory, not pending-common.
+if [ "$FLAVOR" = "-rhel" ]
+then
+	FLAVOR="-ark"
+fi
 
 # to handle this script being a symlink
-cd $SCRIPT_DIR
+cd "$SCRIPT_DIR"
 
+if test -n "$COMMITNEWCONFIGS"; then
+	commit_new_configs
+else
 	process_configs
+fi
+
+exit $RETURNCODE

SOURCES/rpminspect.yaml

@@ -3,19 +3,10 @@
 ---
 inspections:
     abidiff: off
-    addedfiles: off
-    badfuncs: off
-    changedfiles: off
     kmidiff: off
-    kmod: off
-    manpage: off
-    movedfiles: off
-    permissions: off
-    removedfiles: off
-    rpmdeps: off
     upstream: off
 
-elf:
+badfuncs:
     ignore:
         - /usr/libexec/ksamples/*
         - /usr/libexec/kselftests/*
@@ -24,19 +15,23 @@ emptyrpm:
     expected_empty:
         - kernel
         - kernel-debug
+        - kernel-debug-devel-matched
+        - kernel-devel-matched
+        - kernel-lpae
         - kernel-zfcpdump
+        - kernel-zfcpdump-devel-matched
         - kernel-zfcpdump-modules
-        - kernel-rt
+
-        - kernel-rt-debug
+patches:
+    ignore_list:
+        - linux-kernel-test.patch
+        - patch-5.14-redhat.patch
 
 specname:
     match: prefix
     primary: filename
 
-patches:
+runpath:
-    ignore_list:
-        - linux-kernel-test.patch
-
-types:
     ignore:
-        - /usr/src/kernel/*
+        - /usr/libexec/kselftests/bpf/urandom_read
+        - /usr/libexec/kselftests/bpf/no_alu32/urandom_read

SOURCES/update_scripts.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+	exit 1
+fi
+
+TARGET="$1"
+
+for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
+	NEW=${i%.$TARGET}
+	cp "$i" "$(basename "$NEW")"
+done

SOURCES/x509.genkey.centos

@@ -5,9 +5,9 @@ prompt = no
 x509_extensions = myexts
 
 [ req_distinguished_name ]
-O = Red Hat
+O = AlmaLinux
-CN = Red Hat Enterprise Linux kernel signing key
+CN = AlmaLinux kernel signing key
-emailAddress = secalert@redhat.com
+emailAddress = security@almalinux.org
 
 [ myexts ]
 basicConstraints=critical,CA:FALSE

SOURCES/x509.genkey.rhel

@@ -0,0 +1,16 @@
+[ req ]
+default_bits = 3072
+distinguished_name = req_distinguished_name
+prompt = no
+x509_extensions = myexts
+
+[ req_distinguished_name ]
+O = AlmaLinux
+CN = AlmaLinux kernel signing key
+emailAddress = security@almalinux.org
+
+[ myexts ]
+basicConstraints=critical,CA:FALSE
+keyUsage=digitalSignature
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid