.gitignore

@@ -1,10 +1,7 @@
-SOURCES/fedoraimaca.x509
+SOURCES/kernel-abi-stablelists-5.14.0-503.19.1.el9_5.tar.bz2
-SOURCES/kernel-abi-stablelists-6.11.0-0.rc5.23.el10.tar.xz
+SOURCES/kernel-kabi-dw-5.14.0-503.19.1.el9_5.tar.bz2
-SOURCES/kernel-kabi-dw-6.11.0-0.rc5.23.el10.tar.xz
+SOURCES/linux-5.14.0-503.19.1.el9_5.tar.xz
-SOURCES/linux-6.11.0-0.rc5.23.el10.tar.xz
 SOURCES/nvidiagpuoot001.x509
-SOURCES/redhatsecureboot501.cer
-SOURCES/redhatsecurebootca5.cer
 SOURCES/rheldup3.x509
 SOURCES/rhelima.x509
 SOURCES/rhelima_centos.x509

.kernel.metadata

@@ -1,10 +1,7 @@
-9b16961bd5da2dc805f1b73414c201d4371613f1 SOURCES/fedoraimaca.x509
+a614816812a77eadc37c3e71e3b794d58ee62596 SOURCES/kernel-abi-stablelists-5.14.0-503.19.1.el9_5.tar.bz2
-eeceea84d94d4aee31c20b202d00454035ac9bc3 SOURCES/kernel-abi-stablelists-6.11.0-0.rc5.23.el10.tar.xz
+3125e053f6237338119f6f6c32eb3144b0fcbff3 SOURCES/kernel-kabi-dw-5.14.0-503.19.1.el9_5.tar.bz2
-0254d07178299544f453de49ad6f55058656ef4a SOURCES/kernel-kabi-dw-6.11.0-0.rc5.23.el10.tar.xz
+cb25584103dd0b8aa392bac6d1dbf713dc975219 SOURCES/linux-5.14.0-503.19.1.el9_5.tar.xz
-3d05fccce77545e7a68b108bc1a3c04a4fad6976 SOURCES/linux-6.11.0-0.rc5.23.el10.tar.xz
 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509
-ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
-e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
 99e571f9de4188f3b5fdf1f84ff73f6cc4bb6a0e SOURCES/rhelima.x509
 61d5a223ff0c79189505abae77e0087c4b2d2b47 SOURCES/rhelima_centos.x509

SOURCES/Makefile.rhelver

@@ -1,5 +1,5 @@
-RHEL_MAJOR = 10
+RHEL_MAJOR = 9
-RHEL_MINOR = 0
+RHEL_MINOR = 5
 
 #
 # RHEL_RELEASE
@@ -12,20 +12,7 @@ RHEL_MINOR = 0
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 23
+RHEL_RELEASE = 503.19.1
-
-#
-# RHEL_REBASE_NUM
-# ----------------
-#
-# Used in RPM version string for Gemini kernels, which dont use upstream
-# VERSION/PATCHLEVEL/SUBLEVEL. The number represents rebase number for
-# current MAJOR release.
-#
-# Use this spot to avoid future merge conflicts.
-# Do not trim this comment.
-RHEL_REBASE_NUM = 1
-
 
 #
 # ZSTREAM
@@ -47,7 +34,7 @@ RHEL_REBASE_NUM = 1
 #  (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
 #  number will be incremented instead of the Y).
 #
-ZSTREAM ?= no
+ZSTREAM ?= yes
 
 #
 # Early y+1 numbering

SOURCES/cpupower.config

@@ -0,0 +1,3 @@
+# See 'cpupower help' and cpupower(1) for more info
+CPUPOWER_START_OPTS="frequency-set -g performance"
+CPUPOWER_STOP_OPTS="frequency-set -g ondemand"

SOURCES/cpupower.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Configure CPU power related settings
+After=syslog.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/sysconfig/cpupower
+ExecStart=/usr/bin/cpupower $CPUPOWER_START_OPTS
+ExecStop=/usr/bin/cpupower $CPUPOWER_STOP_OPTS
+
+[Install]
+WantedBy=multi-user.target

SOURCES/def_variants.yaml.rhel

@@ -1,523 +0,0 @@
-packages:
-  - name: modules-core
-    depends-on: []
-  - name: modules
-    depends-on:
-    - modules-core
-  - name: modules-internal
-    depends-on:
-    - modules-core
-    - modules
-  - name: modules-extra
-    depends-on:
-    - modules-core
-    - modules
-  - name: modules-rt-kvm
-    if_variant_in: ["rt"]
-    depends-on:
-    - modules-core
-  - name: modules-partner
-    depends-on:
-    - modules-core
-    - modules
-
-rules:
-  - arch/x86/kvm/kvm(-amd|-intel|\.).*: modules-rt-kvm
-    if_variant_in: ["rt"]
-
-  - arch/.*: modules-core
-  - block/t10-pi.ko: modules-core
-  - crypto/.*: modules-core
-
-  - drivers/accel/.*: modules-core
-  - drivers/accessibility/.*: modules-core
-  - drivers/acpi/video.*: modules
-  - drivers/acpi/.*: modules-core
-  - drivers/ata/.*: modules-core
-
-  - drivers/base/.*(kunit|test).*: modules-internal
-  - drivers/base/regmap/regmap-sdw.*: modules
-  - drivers/base/.*: modules-core
-  - drivers/block/floppy.*: modules-extra
-  - drivers/block/rnbd.*: modules
-  - drivers/block/.*: modules-core
-  - drivers/bus/.*: modules-core
-
-  - drivers/cdrom/.*: modules-core
-  - drivers/cdx/.*: modules-core
-  - drivers/char/mwave.*: modules
-  - drivers/char/.*: modules-core
-  - drivers/clk/.*test.*: modules-internal
-  - drivers/clk/.*: modules-core
-  - drivers/counter/.*: modules-core
-  - drivers/cpufreq/amd-pstate-ut.ko: modules-internal
-  - drivers/cpufreq/.*: modules-core
-  - drivers/crypto/caam/.*: modules
-  - drivers/crypto/cavium/.*: modules
-  - drivers/crypto/chelsio/.*: modules
-  - drivers/crypto/hisilicon/.*: modules
-  - drivers/crypto/marvell/.*: modules
-  - drivers/crypto/.*: modules-core
-  - drivers/cxl/.*: modules-core
-
-  - drivers/dax/.*: modules-core
-  - drivers/dca/.*: modules-core
-  - drivers/devfreq/.*: modules-core
-  - drivers/dma/dmatest.*: modules-internal
-  - drivers/dma/.*: modules-core
-
-  - drivers/edac/.*: modules-core
-  - drivers/extcon/.*: modules-core
-
-  - drivers/firmware/iscsi_ibft.*: modules
-  - drivers/firmware/.*: modules-core
-  - drivers/fsi/.*: modules-core
-
-  - drivers/gnss/.*: modules-core
-  - drivers/gpio/gpio-dln2.*: modules-extra
-  - drivers/gpio/gpio-ljca.*: modules
-  - drivers/gpio/.*: modules-core
-  - drivers/gpu/drm/i915/kvmgt.*: modules-rt-kvm
-    if_variant_in: ["rt"]
-  - drivers/gpu/drm/display/drm_.*: modules-core
-  - drivers/gpu/drm/drm.*: modules-core
-  - drivers/gpu/drm/etnaviv/.*: modules-core
-  - drivers/gpu/drm/gud/.*: modules-core
-  - drivers/gpu/drm/hyperv/.*: modules-core
-  - drivers/gpu/drm/imagination/.*: modules-core
-  - drivers/gpu/drm/lima/.*: modules-core
-  - drivers/gpu/drm/mxsfb/.*: modules-core
-  - drivers/gpu/drm/panfrost/.*: modules-core
-  - drivers/gpu/drm/qxl/.*: modules-core
-  - drivers/gpu/drm/scheduler/.*: modules-core
-  - drivers/gpu/drm/solomon/.*: modules-core
-  - drivers/gpu/drm/tests/.*: modules-internal
-  - drivers/gpu/drm/tidss/.*: modules-core
-  - drivers/gpu/drm/tiny/.*: modules-core
-  - drivers/gpu/drm/ttm/.*: modules-core
-  - drivers/gpu/drm/udl/.*: modules-core
-  - drivers/gpu/drm/v3d/.*: modules-core
-  - drivers/gpu/drm/vgem/.*: modules-core
-  - drivers/gpu/drm/virtio/.*: modules-core
-  - drivers/gpu/drm/vkms/.*: modules-core
-  - drivers/gpu/drm/vmwgfx/.*: modules-core
-  - drivers/gpu/drm/xlnx/.*: modules-core
-  - drivers/gpu/host1x/.*: modules-core
-
-  - drivers/hid/.*test.*: modules-internal
-  - drivers/hid/hid-asus.*: modules
-  - drivers/hid/hid-nintendo.*: modules
-  - drivers/hid/hid-picolcd.*: modules
-  - drivers/hid/hid-playstation.*: modules
-  - drivers/hid/surface-hid.*: modules
-  - drivers/hid/hid-prodikeys.*: modules
-  - drivers/hid/.*: modules-core
-  - drivers/hte/.*: modules-core
-  - drivers/hv/.*: modules-core
-  - drivers/hwmon/asus_wmi_sensors.*: modules
-  - drivers/hwmon/dell-smm-hwmon.*: modules
-  - drivers/hwmon/hp-wmi-sensors.*: modules
-  - drivers/hwmon/intel-m10-bmc-hwmon.*: modules
-  - drivers/hwmon/nct6775.*: modules
-  - drivers/hwmon/ntc_thermistor.*: modules
-  - drivers/hwmon/.*: modules-core
-  - drivers/hwspinlock/.*: modules-core
-  - drivers/hwtracing/.*: modules-core
-
-  - drivers/i2c/busses/i2c-dln2.*: modules-extra
-  - drivers/i2c/busses/i2c-ljca.*: modules
-  - drivers/i2c/.*: modules-core
-  - drivers/i3c/.*: modules-core
-  - drivers/iio/adc/dln2-adc.*: modules-extra
-  - drivers/iio/test/.*: modules-internal
-  - drivers/input/gameport/.*: modules
-  - drivers/input/joystick/.*: modules-extra
-  - drivers/input/tablet/.*: modules
-  - drivers/input/tests/.*: modules-internal
-  - drivers/input/touchscreen/.*: modules
-  - drivers/input/.*: modules-core
-  - drivers/interconnect/.*: modules-core
-  - drivers/iommu/.*test.ko: modules-internal
-  - drivers/iommu/.*: modules-core
-  - drivers/irqchip/.*: modules-core
-
-  - drivers/mailbox/.*: modules-core
-  - drivers/md/.*: modules-core
-  - drivers/memory/dfl-emif.*: modules
-  - drivers/memory/.*: modules-core
-  - drivers/message/fusion/mptctl.*: modules-extra
-  - drivers/message/fusion/mptfc.*: modules-extra
-  - drivers/message/fusion/.*: modules
-  - drivers/message/.*: modules-core
-  - drivers/mfd/dln2.*: modules-extra
-  - drivers/misc/.*: modules-core
-  - drivers/mux/.*: modules-core
-
-  - drivers/net/amt.ko: modules-core
-  - drivers/net/bareudp.ko: modules-core
-  - drivers/net/bonding/.*: modules-core
-  - drivers/net/can/slcan/slcan.*: modules-extra
-  - drivers/net/can/usb/ems_usb.*: modules-extra
-  - drivers/net/can/vcan.*: modules-extra
-  - drivers/net/dummy.ko: modules-core
-  - drivers/net/eql.ko: modules-core
-
-  - drivers/net/ethernet/8390/.*: modules-core
-  - drivers/net/ethernet/adi/.*: modules-core
-  - drivers/net/ethernet/agere/.*: modules-core
-  - drivers/net/ethernet/altera/.*: modules-core
-  - drivers/net/ethernet/amazon/.*: modules-core
-  - drivers/net/ethernet/amd/.*: modules-core
-  - drivers/net/ethernet/apm/.*: modules-core
-  - drivers/net/ethernet/asix/.*: modules-core
-  - drivers/net/ethernet/brocade/.*: modules-core
-  - drivers/net/ethernet/cavium/.*: modules-core
-  - drivers/net/ethernet/dnet.ko: modules-core
-  - drivers/net/ethernet/engleder/.*: modules-core
-  - drivers/net/ethernet/ethoc.ko: modules-core
-  - drivers/net/ethernet/fealnx.ko: modules-core
-  - drivers/net/ethernet/freescale/.*: modules-core
-  - drivers/net/ethernet/fungible/.*: modules-core
-  - drivers/net/ethernet/google/.*: modules-core
-  - drivers/net/ethernet/hisilicon/.*: modules-core
-  - drivers/net/ethernet/huawei/.*: modules-core
-  - drivers/net/ethernet/ibm/.*: modules-core
-  - drivers/net/ethernet/intel/.*: modules-core
-  - drivers/net/ethernet/jme.ko: modules-core
-  - drivers/net/ethernet/litex/.*: modules-core
-  - drivers/net/ethernet/mellanox/.*: modules-core
-  - drivers/net/ethernet/microsoft/.*: modules-core
-  - drivers/net/ethernet/myricom/.*: modules-core
-  - drivers/net/ethernet/natsemi/.*: modules-core
-  - drivers/net/ethernet/netronome/.*: modules-core
-  - drivers/net/ethernet/pensando/.*: modules-core
-  - drivers/net/ethernet/rocker/rocker.*: modules-internal
-  - drivers/net/ethernet/qualcomm/.*: modules-core
-  - drivers/net/ethernet/realtek/.*: modules-core
-  - drivers/net/ethernet/renesas/.*: modules-core
-  - drivers/net/ethernet/socionext/.*: modules-core
-  - drivers/net/ethernet/vertexcom/.*: modules-core
-  - drivers/net/ethernet/wangxun/.*: modules-core
-  - drivers/net/ethernet/xilinx/.*: modules-core
-
-  - drivers/net/fjes/.*: modules-core
-  - drivers/net/geneve.ko: modules-core
-  - drivers/net/gtp.ko: modules-core
-  - drivers/net/hamradio/.*: modules-extra
-  - drivers/net/hyperv/.*: modules-core
-  - drivers/net/ifb.ko: modules-core
-  - drivers/net/ipa/.*: modules-core
-  - drivers/net/ipvlan/.*: modules-core
-  - drivers/net/macsec.ko: modules-core
-  - drivers/net/macvlan.ko: modules-core
-  - drivers/net/macvtap.ko: modules-core
-  - drivers/net/mctp/.*: modules-core
-  - drivers/net/mdio.*: modules-core
-  - drivers/net/mhi_net.ko: modules-core
-  - drivers/net/mii.ko: modules-core
-  - drivers/net/net_failover.ko: modules-core
-  - drivers/net/netdevsim/netdevsim.*: modules-internal
-  - drivers/net/netconsole.ko: modules-core
-  - drivers/net/nlmon.ko: modules-core
-  - drivers/net/pcs/.*: modules-core
-  - drivers/net/phy/.*: modules-core
-  - drivers/net/rionet.ko: modules-core
-  - drivers/net/slip/slip.*: modules-extra
-  - drivers/net/sungem_phy.ko: modules-core
-  - drivers/net/tap.ko: modules-core
-  - drivers/net/team/.*: modules-core
-  - drivers/net/thunderbolt/.*: modules-core
-  - drivers/net/tun.ko: modules-core
-  - drivers/net/veth.ko: modules-core
-  - drivers/net/virtio_net.ko: modules-core
-  - drivers/net/vmxnet3/.*: modules-core
-  - drivers/net/vrf.ko: modules-core
-  - drivers/net/vsockmon.ko: modules-core
-  - drivers/net/vxlan/.*: modules-core
-  - drivers/net/wan/hdlc.*: modules-core
-  - drivers/net/wireguard/.*: modules-core
-  - drivers/net/wireless/virtual/mac80211_hwsim.*: modules-internal
-  - drivers/net/wwan/wwan_hwsim.*: modules-internal
-  - drivers/net/wwan/.*: modules-core
-  - drivers/net/xen.*: modules-core
-
-  - drivers/nvdimm/.*: modules-core
-  - drivers/nvme/host/nvme-rdma.*: modules
-  - drivers/nvme/target/nvmet-rdma.*: modules
-  - drivers/nvme/.*: modules-core
-  - drivers/nvmem/nvmem_u-boot-env.*: modules
-  - drivers/nvmem/.*: modules-core
-
-  - drivers/parport/parport_serial.*: modules
-  - drivers/parport/.*: modules-core
-  - drivers/pci/pcie/aer_inject.*: modules-extra
-  - drivers/pci/.*: modules-core
-  - drivers/perf/.*: modules-core
-  - drivers/phy/.*: modules-core
-  - drivers/pinctrl/.*: modules-core
-  - drivers/platform/chrome/.*test.*: modules-internal
-  - drivers/platform/x86/intel/intel_vsec.*: modules-core
-  - drivers/pmdomain/.*: modules-core
-  - drivers/powercap/intel_rapl_tpmi.*: modules
-  - drivers/powercap/.*: modules-core
-  - drivers/pps/.*: modules-core
-  - drivers/ptp/ptp_kvm.*: modules-rt-kvm
-    if_variant_in: ["rt"]
-  - drivers/ptp/ptp_mock.*: modules-internal
-  - drivers/ptp/ptp_dfl_tod.*: modules
-  - drivers/ptp/.*: modules-core
-  - drivers/pwm/.*: modules-core
-
-  - drivers/rapidio/.*: modules-core
-  - drivers/regulator/arizona-micsupp.*: modules
-  - drivers/regulator/.*: modules-core
-  - drivers/remoteproc/.*: modules-core
-  - drivers/reset/.*: modules-core
-  - drivers/rpmsg/.*: modules-core
-  - drivers/rtc/.*test.*: modules-internal
-  - drivers/rtc/.*: modules-core
-
-  - drivers/s390/net/ism.*: modules
-  - drivers/s390/.*: modules-core
-
-  - drivers/scsi/3w.*: modules-core
-  - drivers/scsi/BusLogic.ko: modules-core
-  - drivers/scsi/a100u2w.ko: modules-core
-  - drivers/scsi/advansys.ko: modules-core
-  - drivers/scsi/am53c974.ko: modules-core
-  - drivers/scsi/arcmsr.*: modules-core
-  - drivers/scsi/atp870u.ko: modules-core
-  - drivers/scsi/ch.ko: modules-core
-  - drivers/scsi/cxlflash/.*: modules-core
-  - drivers/scsi/dc395x.ko: modules-core
-  - drivers/scsi/device_handler/.*: modules-core
-  - drivers/scsi/dmx3191d.ko: modules-core
-  - drivers/scsi/elx/.*: modules-core
-  - drivers/scsi/esp_scsi.ko: modules-core
-  - drivers/scsi/fdomain.*: modules-core
-  - drivers/scsi/hpsa.ko: modules-core
-  - drivers/scsi/hptiop.ko: modules-core
-  - drivers/scsi/hv_storvsc.ko: modules-core
-  - drivers/scsi/ibmvscsi.*: modules-core
-  - drivers/scsi/initio.ko: modules-core
-  - drivers/scsi/ipr.ko: modules-core
-  - drivers/scsi/ips.ko: modules-core
-  - drivers/scsi/iscsi_tcp.ko: modules-core
-  - drivers/scsi/libfc/.*: modules-core
-  - drivers/scsi/libiscsi.*: modules-core
-  - drivers/scsi/mpi3mr/.*: modules-core
-  - drivers/scsi/mvumi.ko: modules-core
-  - drivers/scsi/myrb.ko: modules-core
-  - drivers/scsi/myrs.ko: modules-core
-  - drivers/scsi/raid_class.ko: modules-core
-  - drivers/scsi/scsi_debug.ko: modules-core
-  - drivers/scsi/scsi_transport_.*: modules-core
-  - drivers/scsi/sd_mod.ko: modules-core
-  - drivers/scsi/ses.ko: modules-core
-  - drivers/scsi/sg.ko: modules-core
-  - drivers/scsi/smartpqi/.*: modules-core
-  - drivers/scsi/snic/.*: modules-core
-  - drivers/scsi/sr_mod.ko: modules-core
-  - drivers/scsi/st.ko: modules-core
-  - drivers/scsi/stex.ko: modules-core
-  - drivers/scsi/virtio_scsi.ko: modules-core
-  - drivers/scsi/vmw_pvscsi.ko: modules-core
-  - drivers/scsi/wd719x.ko: modules-core
-  - drivers/scsi/xen-scsifront.ko: modules-core
-
-  - drivers/slimbus/.*: modules-core
-  - drivers/soc/.*: modules-core
-  - drivers/spi/spi-altera-dfl.*: modules
-  - drivers/spi/spi-dln2.*: modules-extra
-  - drivers/spi/spi-ljca.*: modules
-  - drivers/spi/.*: modules-core
-  - drivers/spmi/.*: modules-core
-
-  - drivers/target/iscsi/cxgbit/cxgbit.*: modules
-  - drivers/target/sbp/sbp_target.*: modules
-  - drivers/target/target_core_user.*: modules
-  - drivers/target/.*: modules-core
-  - drivers/tee/.*: modules-core
-  - drivers/thermal/intel/int340x_thermal/int3406_thermal.*: modules
-  - drivers/thermal/.*: modules-core
-  - drivers/thunderbolt/.*: modules-core
-
-  - drivers/ufs/.*: modules-core
-  - drivers/usb/atm/.*: modules
-  - drivers/usb/gadget/function/usb_f_midi2.*: modules
-  - drivers/usb/image/.*: modules
-  - drivers/usb/misc/trancevibrator.*: modules-extra
-  - drivers/usb/misc/.*: modules
-  - drivers/usb/serial/.*: modules
-  - drivers/usb/typec/mux/nb7vpq904m.*: modules
-  - drivers/usb/usbip/.*: modules-extra
-  - drivers/usb/.*: modules-core
-
-  - drivers/vdpa/mlx5/mlx5_vdpa.*: modules
-  - drivers/vdpa/pds/pds_vdpa.*: modules
-  - drivers/vdpa/.*: modules-core
-  - drivers/vfio/pci/mlx5/mlx5-vfio-pci.*: modules
-  - drivers/vfio/pci/pds/pds-vfio-pc.*: modules
-  - drivers/vfio/.*: modules-core
-  - drivers/vhost/.*: modules-core
-  - drivers/video/backlight/apple_bl.*: modules
-  - drivers/video/.*: modules-core
-  - drivers/virt/.*: modules-core
-  - drivers/virtio/.*: modules-core
-
-  - drivers/watchdog/.*: modules-core
-
-  - drivers/xen/.*: modules-core
-
-  - drivers/w1/masters/ds2482.*: modules-extra
-  - drivers/w1/masters/ds2490.*: modules-extra
-  - drivers/w1/slaves/w1_ds2408.*: modules-extra
-  - drivers/w1/slaves/w1_ds2423.*: modules-extra
-  - drivers/w1/slaves/w1_ds2431.*: modules-extra
-  - drivers/w1/slaves/w1_ds2433.*: modules-extra
-  - drivers/w1/slaves/w1_ds2780.*: modules-extra
-  - drivers/w1/slaves/w1_ds2781.*: modules-extra
-  - drivers/w1/slaves/w1_ds28e04.*: modules-extra
-  - drivers/w1/slaves/w1_smem.*: modules-extra
-  - drivers/w1/slaves/w1_therm.*: modules-extra
-
-  - fs/.*test.*: modules-internal
-  - fs/9p/.*: modules-core
-  - fs/afs/.*: modules-partner
-  - fs/affs/affs.*: modules-extra
-  - fs/bcachefs/.*: modules-core
-  - fs/befs/befs.*: modules-extra
-  - fs/binfmt_misc.ko: modules-core
-  - fs/cachefiles/.*: modules-core
-  - fs/ceph/.*: modules-core
-  - fs/coda/coda.*: modules-extra
-  - fs/dlm/.*: modules-core
-  - fs/erofs/.*: modules-core
-  - fs/exfat/.*: modules-core
-  - fs/ext4/.*: modules-core
-  - fs/f2fs/.*: modules-core
-  - fs/fat/.*: modules-core
-  - fs/fuse/cuse.*: modules-extra
-  - fs/fuse/.*: modules-core
-  - fs/gfs2/.*: modules-core
-  - fs/isofs/.*: modules-core
-  - fs/jbd2/.*: modules-core
-  - fs/lockd/.*: modules-core
-  - fs/mbcache.ko: modules-core
-  - fs/netfs/.*: modules-core
-  - fs/nfs.*: modules-core
-  - fs/nilfs2/nilfs2.*: modules-extra
-  - fs/nls/.*: modules-core
-  - fs/ntfs3/.*: modules-core
-  - fs/ocfs2/.*: modules-extra
-  - fs/orangefs/.*: modules-core
-  - fs/overlayfs/.*: modules-core
-  - fs/pstore/.*: modules-core
-  - fs/sysv/.*: modules-extra
-  - fs/ubifs/.*: modules-extra
-  - fs/udf/.*: modules-core
-  - fs/ufs/.*: modules-extra
-  - fs/vboxsf/.*: modules-core
-  - fs/xfs/.*: modules-core
-  - fs/zonefs/.*: modules-core
-
-  - kernel/.*test.*: modules-internal
-  - kernel/locking/locktorture.*: modules-internal
-  - kernel/rcu/rcuscale.*: modules-internal
-  - kernel/rcu/rcutorture.*: modules-internal
-  - kernel/rcu/refscale.*: modules-internal
-  - kernel/resource_kunit.*: modules-internal
-  - kernel/scftorture.*: modules-internal
-  - kernel/torture.*: modules-internal
-  - kernel/.*: modules-core
-
-  - lib/test_lockup.*: modules-extra
-  - lib/.*(test|kunit).*: modules-internal
-  - lib/.*: modules-core
-
-  - mm/kasan/kasan_test: modules-internal
-  - mm/kfence/.*test.*: modules-internal
-  - mm/zsmalloc.ko: modules-core
-
-  - net/.*test.*: modules-internal
-  - net/802/.*: modules-core
-  - net/8021q/.*: modules-core
-  - net/9p/9pnet_rdma.ko: modules
-  - net/9p/.*: modules-core
-  - net/appletalk/appletalk.*: modules-extra
-  - net/atm/br2684.*: modules-extra
-  - net/atm/clip.*: modules-extra
-  - net/atm/lec.*: modules-extra
-  - net/atm/pppoatm.*: modules-extra
-  - net/ax25/ax25.*: modules-extra
-  - net/batman-adv/batman-adv.*: modules-extra
-  - net/bridge/br_netfilter.*: modules-extra
-  - net/bridge/netfilter/ebt.*: modules-extra
-  - net/bridge/.*: modules-core
-  - net/ceph/.*: modules-core
-  - net/core/pktgen.*: modules-internal
-  - net/core/.*: modules-core
-  - net/dns_resolver/.*: modules-core
-  - net/hsr/.*: modules-core
-  - net/ife/.*: modules-core
-  - net/ipv4/netfilter/arp.*: modules-extra
-  - net/ipv4/netfilter/ip[_t].*: modules-extra
-  - net/ipv4/tcp_bic.*: modules-extra
-  - net/ipv4/tcp_highspeed.*: modules-extra
-  - net/ipv4/tcp_htcp.*: modules-extra
-  - net/ipv4/tcp_hybla.*: modules-extra
-  - net/ipv4/tcp_illinois.*: modules-extra
-  - net/ipv4/tcp_lp.*: modules-extra
-  - net/ipv4/tcp_scalable.*: modules-extra
-  - net/ipv4/tcp_vegas.*: modules-extra
-  - net/ipv4/tcp_veno.*: modules-extra
-  - net/ipv4/tcp_westwood.*: modules-extra
-  - net/ipv4/tcp_yeah.*: modules-extra
-  - net/ipv4/.*: modules-core
-  - net/ipv6/netfilter/ebt.*: modules-extra
-  - net/ipv6/netfilter/ip6[_t].*: modules-extra
-  - net/ipv6/.*: modules-core
-  - net/iucv/.*: modules-core
-  - net/kcm/.*: modules-core
-  - net/key/.*: modules-core
-  - net/l2tp/.*: modules-extra
-  - net/llc/.*: modules-core
-  - net/netfilter/ipset/.*: modules-extra
-  - net/netfilter/nft_compat.*: modules-extra
-  - net/netfilter/xt_.*: modules-extra
-  - net/netfilter/.*: modules-core
-  - net/netrom/netrom.*: modules-extra
-  - net/nsh/.*: modules-core
-  - net/openvswitch/.*: modules-core
-  - net/psample/.*: modules-core
-  - net/qrtr/.*: modules-core
-  - net/rds/rds.*: modules-extra
-  - net/rose/rose.*: modules-extra
-  - net/rxrpc/.*: modules-partner
-  - net/sched/sch_choke.*: modules-extra
-  - net/sched/sch_drr.*: modules-extra
-  - net/sched/sch_gred.*: modules-extra
-  - net/sched/sch_mqprio.ko: modules-extra
-  - net/sched/sch_multiq.*: modules-extra
-  - net/sched/sch_netem.*: modules-extra
-  - net/sched/sch_qfq.*: modules-extra
-  - net/sched/sch_red.*: modules-extra
-  - net/sched/sch_sfb.*: modules-extra
-  - net/sched/sch_teql.*: modules-extra
-  - net/sched/.*: modules-core
-  - net/sctp/.*: modules-extra
-  - net/sunrpc/xprtrdma/rpcrdma.*: modules
-  - net/sunrpc/.*: modules-core
-  - net/tipc/.*: modules-extra
-  - net/tls/.*: modules-core
-  - net/vmw_vsock/.*: modules-core
-  - net/xdp/.*: modules-core
-  - net/xfrm/.*: modules-core
-
-  - samples/.*: modules-internal
-  - sound/pci/.*test.*: modules-internal
-  - sound/soc/.*test.*: modules-internal
-
-  - virt/.*: modules-core
-
-  - default: modules

SOURCES/dracut-virt.conf

@@ -12,17 +12,10 @@ dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usr
 dracutmodules+=" dm lvm rootfs-block fs-lib "
 
 # modules: tpm and crypto
-dracutmodules+=" crypt crypt-loop tpm2-tss systemd-pcrphase "
+dracutmodules+=" crypt crypt-loop tpm2-tss "
 
-# dracut >= 102 separated systemd-cryptsetup into its own module
+# WALinuxagent-cvm with CVM specific udev rules
-CSMODULE=`dracut --list-modules --no-kernel | grep '^systemd-cryptsetup$'`
+dracutmodules+=" walinuxagentcvm "
-dracutmodules+=" $CSMODULE "
-
-# modules: support root on virtiofs
-dracutmodules+=" virtiofs "
-
-# modules: use sysext images (see 'man systemd-sysext')
-dracutmodules+=" systemd-sysext "
 
 # modules: root disk integrity protection
 dracutmodules+=" systemd-veritysetup "
@@ -46,3 +39,6 @@ drivers+=" dm_verity overlay "
 
 # 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

@@ -0,0 +1,18 @@
+#! /bin/bash
+
+# This is the aarch64 override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+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"
+
+ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
+
+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 chtls"

SOURCES/filter-modules.sh.rhel

@@ -0,0 +1,177 @@
+#! /bin/bash
+#
+# Called as filter-modules.sh list-of-modules Arch
+
+# This script filters the modules into the kernel-core and kernel-modules
+# subpackages.  We list out subsystems/subdirs to prune from the installed
+# module directory.  What is left is put into the kernel-core package.  What is
+# pruned is contained in the kernel-modules package.
+#
+# This file contains the default subsys/subdirs to prune from all architectures.
+# If an architecture needs to differ, we source a per-arch filter-<arch>.sh file
+# that contains the set of override lists to be used instead.  If a module or
+# 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 isst_if_common isst_tpmi_core isst_tpmi intel_vsec intel_vsec_tpmi"
+
+# 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"
+
+chardrvs="mwave pcmcia"
+
+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"
+
+usbdrvs="atm image misc serial wusbcore"
+
+fsdrvs="affs befs smb coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
+
+netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
+
+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 chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor video"
+
+# Grab the arch-specific filter list overrides
+source ./filter-$2.sh
+
+filter_dir() {
+	filelist=$1
+	dir=$2
+
+	grep -v -e "${dir}/" ${filelist} > ${filelist}.tmp
+
+	if [ $? -ne 0 ]
+	then
+		echo "Couldn't remove ${dir}.  Skipping."
+	else
+		grep -e "${dir}/" ${filelist} >> k-d.list
+		mv ${filelist}.tmp $filelist
+	fi
+	
+	return 0
+}
+
+filter_ko() {
+	filelist=$1
+	mod=$2
+
+	grep -v -e "${mod}.ko" ${filelist} > ${filelist}.tmp
+
+	if [ $? -ne 0 ]
+	then
+		echo "Couldn't remove ${mod}.ko  Skipping."
+	else
+		grep -e "${mod}.ko" ${filelist} >> k-d.list
+		mv ${filelist}.tmp $filelist
+	fi
+	
+	return 0
+}
+
+# Filter the drivers/ subsystems
+for subsys in ${driverdirs}
+do
+	filter_dir $1 drivers/${subsys}
+done
+
+# Filter the networking drivers
+for netdrv in ${netdrvs}
+do
+	filter_dir $1 drivers/net/${netdrv}
+done
+
+# Filter the char drivers
+for char in ${chardrvs}
+do
+	filter_dir $1 drivers/char/${char}
+done
+
+# Filter the ethernet drivers
+for eth in ${ethdrvs}
+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
+	filter_dir $1 drivers/scsi/${scsi}
+done
+
+# Input
+for input in ${inputdrvs}
+do
+	filter_dir $1 drivers/input/${input}
+done
+
+# USB
+for usb in ${usbdrvs}
+do
+	filter_dir $1 drivers/usb/${usb}
+done
+
+# Filesystems
+for fs in ${fsdrvs}
+do
+	filter_dir $1 fs/${fs}
+done
+
+# Network protocols
+for prot in ${netprots}
+do
+	filter_dir $1 kernel/net/${prot}
+done
+
+# DRM
+for drm in ${drmdrvs}
+do
+	filter_dir $1 drivers/gpu/drm/${drm}
+done
+
+# Just kill sound.
+filter_dir $1 kernel/sound
+filter_dir $1 kernel/drivers/soundwire
+
+# Now go through and filter any single .ko files that might have deps on the
+# things we filtered above
+for mod in ${singlemods}
+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`
+do
+	rm -rf $mod
+done

SOURCES/filter-ppc64le.sh.rhel

@@ -0,0 +1,14 @@
+#! /bin/bash
+
+# This is the ppc64le override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+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 chtls"

SOURCES/filter-s390x.sh.rhel

@@ -0,0 +1,12 @@
+#! /bin/bash
+
+# This is the s390x override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+# Defaults work so no need to override

SOURCES/filter-x86_64.sh.rhel

@@ -0,0 +1,12 @@
+#! /bin/bash
+
+# This is the x86_64 override file for the core/drivers package split.  The
+# module directories listed here and in the generic list in filter-modules.sh
+# will be moved to the resulting kernel-modules package for this arch.
+# Anything not listed in those files will be in the kernel-core package.
+#
+# Please review the default list in filter-modules.sh before making
+# modifications to the overrides below.  If something should be removed across
+# all arches, remove it in the default instead of per-arch.
+
+# Defaults work so no need to override

SOURCES/flavors

@@ -1 +0,0 @@
-rhel

SOURCES/gating.yaml

@@ -1,9 +1,14 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: cki.tier1-aarch64.functional}
   - !PassingTestCaseRule {test_case_name: cki.tier1-ppc64le.functional}
   - !PassingTestCaseRule {test_case_name: cki.tier1-s390x.functional}
   - !PassingTestCaseRule {test_case_name: cki.tier1-x86_64.functional}
+  - !PassingTestCaseRule {test_case_name: s1-aws-ci_x86_64.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: s1-aws-ci_aarch64.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: s1-azure-ci_x86_64.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: s1-azure-ci_aarch64.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: s1-gcp-ci.brew-build.tier1.functional}

SOURCES/generate_all_configs.sh

@@ -19,20 +19,18 @@ else
 	SECONDARY=fedora
 fi
 
-# The +1 is to remove the - at the end of the SPECPACKAGE_NAME string
+for i in kernel-*-"$FLAVOR".config; do
-specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1))
+	NEW=kernel-"$SPECVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//)
-for i in "${SPECPACKAGE_NAME}"*-"$FLAVOR".config; do
+	#echo $NEW
-	# shellcheck disable=SC3057
-	NEW=${SPECPACKAGE_NAME}-"$SPECRPMVERSION"-$(echo "${i:$specpackage_name_len}" | sed s/-"$FLAVOR"//)
 	mv "$i" "$NEW"
 done
 
 rm -f kernel-*-"$SECONDARY".config
 
 if [ "$DEBUGBUILDSENABLED" -eq 0 ]; then
-	for i in "${SPECPACKAGE_NAME}"-*debug*.config; do
+	for i in kernel-*debug*.config; do
 		base=$(echo "$i" | sed -r s/-?debug//g)
-		NEW=${SPECPACKAGE_NAME}-$(echo "$base" | cut -d - -f2-)
+		NEW=kernel-$(echo "$base" | cut -d - -f2-)
 		mv "$i" "$NEW"
 	done
 fi

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/merge.py

@@ -1,88 +0,0 @@
-#!/usr/bin/python3
-# SPDX-License-Identifier: GPL-2.0
-# Author: Clark Williams <williams@redhat.com>
-# Copyright (C) 2022 Red Hat, Inc.
-#
-# merge.py - a direct replacement for merge.pl in the redhat/configs directory
-#
-# invocation:   python merge.py overrides baseconfig [arch]
-#
-# This script merges two kernel configuration files, an override file and a
-# base config file and writes the results to stdout.
-#
-# The script reads the overrides into a dictionary, then reads the baseconfig
-# file, looking for overrides and replacing any found, then printing the result
-# to stdout. Finally any remaining (new) configs in the override are appended to the
-# end of the output
-
-import sys
-import re
-import os.path
-
-def usage(msg):
-    '''print a usage message and exit'''
-    sys.stderr.write(msg + "\n")
-    sys.stderr.write("usage: merge.py overrides baseconfig [arch]\n")
-    sys.exit(1)
-
-isset = re.compile(r'^(CONFIG_\w+)=')
-notset = re.compile(r'^#\s+(CONFIG_\w+)\s+is not set')
-
-# search an input line for a config (set or notset) pattern
-# if we get a match return the config that is being changed
-def find_config(line):
-    '''find a configuration line in the input and return the config name'''
-    m = isset.match(line)
-    if (m is not None):
-        return m.group(1)
-
-    m = notset.match(line)
-    if (m is not None):
-        return m.group(1)
-
-    return None
-
-#########################################################
-
-if len(sys.argv) < 3:
-    usage("must have two input files")
-
-override_file = sys.argv[1]
-baseconfig_file = sys.argv[2]
-
-if not os.path.exists(override_file):
-    usage(f"overrides config file {override_file:s} does not exist!")
-
-if not os.path.exists(baseconfig_file):
-    usage(f"base configs file {baseconfig_file:s} does not exist")
-
-if len(sys.argv) == 4:
-    print(f"# {sys.argv[3]:s}")
-
-# read each line of the override file and store any configuration values
-# in the overrides dictionary, keyed by the configuration name.
-overrides = {}
-with open(override_file, "rt", encoding="utf-8") as f:
-    for line in [l.strip() for l in f.readlines()]:
-        c = find_config(line)
-        if c and c not in overrides:
-            overrides[c] = line
-
-# now read and print the base config, checking each line
-# that defines a config value and printing the override if
-# it exists
-with open(baseconfig_file, "rt", encoding="utf-8") as f:
-    for line in [ l.strip() for l in f.readlines() ]:
-        c = find_config(line)
-        if c and c in overrides:
-            print(overrides[c])
-            del overrides[c]
-        else:
-            print(line)
-
-# print out the remaining configs (new values)
-# from the overrides file
-for v in overrides.values():
-    print (v)
-
-sys.exit(0)

SOURCES/mod-denylist.sh

@@ -1,16 +1,18 @@
 #! /bin/bash
 # shellcheck disable=SC2164
 
-rpm_buildroot="$1"
+RpmDir=$1
-module_dir="$2"
+ModDir=$2
-module_list="$3"
+Dir="$1/$2"
-
+# Note the list filename must have the format mod-[PACKAGE].list, for example,
-blacklist_conf_files="$(mktemp)"
+# mod-internal.list or mod-extra.list.  The PACKAGE is used to create a
+# override directory for the modules.
+List=$3
+Dest="$4"
 
 blacklist()
 {
-	mkdir -p "$rpm_buildroot/etc/modprobe.d/"
+	cat > "$RpmDir/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
-	cat > "$rpm_buildroot/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
 	# This kernel module can be automatically loaded by non-root users. To
 	# enhance system security, the module is blacklisted by default to ensure
 	# system administrators make the module available for use as needed.
@@ -19,12 +21,11 @@ blacklist()
 	# Remove the blacklist by adding a comment # at the start of the line.
 	blacklist $1
 __EOF__
-	echo "%config(noreplace) /etc/modprobe.d/$1-blacklist.conf" >> "$blacklist_conf_files"
 }
 
 check_blacklist()
 {
-	mod="$rpm_buildroot/$1"
+	mod=$(find "$RpmDir/$ModDir" -name "$1")
 	[ ! "$mod" ] && return 0
 	if modinfo "$mod" | grep -q '^alias:\s\+net-'; then
 		mod="${1##*/}"
@@ -34,6 +35,28 @@ check_blacklist()
 	fi
 }
 
+find_depends()
+{
+	dep=$1
+	depends=$(modinfo "$dep" | sed -n -e "/^depends/ s/^depends:[ \t]*//p")
+	[ -z "$depends" ] && exit
+	for mod in ${depends//,/ }
+	do
+		match=$(grep "^$mod.ko" "$ListName")
+		[ -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
+		match2=$(grep "^$mod2" "$ListName")
+		if [ -n "$match2" ]
+		then
+			#echo $mod2 >> notreq.list
+			continue
+		fi
+		echo "$mod".ko >> req.list
+	done
+}
+
 foreachp()
 {
 	P=$(nproc)
@@ -51,17 +74,91 @@ foreachp()
 	wait
 }
 
+# Destination was specified on the command line
+test -n "$4" && echo "$0: Override Destination $Dest has been specified."
+
+pushd "$Dir"
+
+OverrideDir=$(basename "$List")
+OverrideDir=${OverrideDir%.*}
+OverrideDir=${OverrideDir#*-}
+mkdir -p "$OverrideDir"
+
+rm -rf modnames
+find . -name "*.ko" -type f > modnames
+# Look through all of the modules, and throw any that have a dependency in
+# our list into the list as well.
+rm -rf dep.list dep2.list
+rm -rf req.list req2.list
+touch dep.list req.list
+cp "$List" .
+
+# This variable needs to be exported because it is used in sub-script
+# executed by xargs
+ListName=$(basename "$List")
+export ListName
+
+foreachp find_depends < modnames
+
+sort -u req.list > req2.list
+sort -u "$ListName" > modules2.list
+join -v 1 modules2.list req2.list > modules3.list
+
+while IFS= read -r mod
+do
+    # get the path for the module
+    modpath=$(grep /"$mod" modnames)
+    [ -z "$modpath" ] && continue
+    echo "$modpath" >> dep.list
+done < modules3.list
+
+sort -u dep.list > dep2.list
+
+if [ -n "$Dest" ]; then
+    # now move the modules into the $Dest directory
+    while IFS= read -r mod
+    do
+	newpath=$(dirname "$mod" | sed -e "s/kernel\\//$Dest\//")
+	mkdir -p "$newpath"
+	mv "$mod" "$newpath"
+	echo "$mod" | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> "$RpmDir"/"$ListName"
+    done < dep2.list
+fi
+
+popd
+
+# If we're signing modules, we can't leave the .mod files for the .ko files
+# we've moved in .tmp_versions/.  Remove them so the Kbuild 'modules_sign'
+# target doesn't try to sign a non-existent file.  This is kinda ugly, but
+# so are the modules-* packages.
+
+while IFS= read -r mod
+do
+  modfile=$(basename "$mod" | sed -e 's/.ko/.mod/')
+  rm .tmp_versions/"$modfile"
+done < "$Dir"/dep2.list
+
+if [ -z "$Dest" ]; then
+	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"
+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=("$rpm_buildroot"/"$module_dir"/kernel/drivers/block/floppy.ko*)
+floppylist=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*)
 if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then
      blacklist "floppy"
 fi
 
-foreachp check_blacklist < "$module_list"
+# avoid an empty kernel-extra package
+echo "$ModDir/$OverrideDir" >> "$RpmDir/$ListName"
 
-cat "$blacklist_conf_files" >> "$module_list"
+pushd "$Dir"
-rm -f "$blacklist_conf_files"
+rm modnames dep.list dep2.list req.list req2.list
+rm "$ListName" modules2.list modules3.list
+popd

SOURCES/mod-extra.list.rhel

@@ -0,0 +1,193 @@
+6pack.ko
+a3d.ko
+act200l-sir.ko
+actisys-sir.ko
+adi.ko
+aer_inject.ko
+af_802154.ko
+affs.ko
+ali-ircc.ko
+analog.ko
+appletalk.ko
+atm.ko
+avma1_cs.ko
+avm_cs.ko
+avmfritz.ko
+ax25.ko
+b1.ko
+bas_gigaset.ko
+batman-adv.ko
+baycom_par.ko
+baycom_ser_fdx.ko
+baycom_ser_hdx.ko
+befs.ko
+bpqether.ko
+br2684.ko
+capi.ko
+c_can.ko
+c_can_platform.ko
+clip.ko
+cobra.ko
+coda.ko
+cuse.ko
+db9.ko
+dccp_diag.ko
+dccp_ipv4.ko
+dccp_ipv6.ko
+dccp.ko
+dccp_probe.ko
+diva_idi.ko
+divas.ko
+ds1wm.ko
+ds2482.ko
+ds2490.ko
+dss1_divert.ko
+elsa_cs.ko
+ems_pci.ko
+ems_usb.ko
+esd_usb2.ko
+esi-sir.ko
+gamecon.ko
+gf2k.ko
+gigaset.ko
+girbil-sir.ko
+grip.ko
+grip_mp.ko
+guillemot.ko
+hdlcdrv.ko
+hfc4s8s_l1.ko
+hfcmulti.ko
+hfcpci.ko
+hisax.ko
+hwa-rc.ko
+hysdn.ko
+i2400m.ko
+i2400m-sdio.ko
+i2400m-usb.ko
+ieee802154.ko
+iforce.ko
+interact.ko
+ipddp.ko
+ipx.ko
+isdn.ko
+joydump.ko
+kingsun-sir.ko
+ks959-sir.ko
+ksdazzle-sir.ko
+kvaser_pci.ko
+l2tp_core.ko
+l2tp_debugfs.ko
+l2tp_eth.ko
+l2tp_ip.ko
+l2tp_ip6.ko
+l2tp_netlink.ko
+l2tp_ppp.ko
+lec.ko
+ma600-sir.ko
+magellan.ko
+mcp2120-sir.ko
+mISDN_core.ko
+mISDN_dsp.ko
+mkiss.ko
+mptbase.ko
+mptctl.ko
+mptfc.ko
+nci.ko
+ncpfs.ko
+netjet.ko
+netrom.ko
+nfc.ko
+nilfs2.ko
+ocfs2_dlmfs.ko
+ocfs2_dlm.ko
+ocfs2.ko
+ocfs2_nodemanager.ko
+ocfs2_stackglue.ko
+ocfs2_stack_o2cb.ko
+ocfs2_stack_user.ko
+old_belkin-sir.ko
+orinoco_cs.ko
+orinoco.ko
+orinoco_nortel.ko
+orinoco_pci.ko
+orinoco_plx.ko
+orinoco_usb.ko
+plx_pci.ko
+pn_pep.ko
+pppoatm.ko
+rds.ko
+rds_rdma.ko
+rds_tcp.ko
+rose.ko
+sch_atm.ko
+sch_cbq.ko
+sch_choke.ko
+sch_drr.ko
+sch_dsmark.ko
+sch_gred.ko
+sch_mqprio.ko
+sch_multiq.ko
+sch_netem.ko
+sch_qfq.ko
+sch_red.ko
+sch_sfb.ko
+sch_teql.ko
+sctp.ko
+sctp_diag.ko
+sctp_probe.ko
+sidewinder.ko
+sja1000.ko
+sja1000_platform.ko
+slcan.ko
+slip.ko
+softing_cs.ko
+softing.ko
+spaceball.ko
+spaceorb.ko
+stinger.ko
+sysv.ko
+tcp_bic.ko
+tcp_highspeed.ko
+tcp_htcp.ko
+tcp_hybla.ko
+tcp_illinois.ko
+tcp_lp.ko
+tcp_scalable.ko
+tcp_vegas.ko
+tcp_veno.ko
+tcp_westwood.ko
+tcp_yeah.ko
+tekram-sir.ko
+test_lockup.ko
+tmdc.ko
+toim3232-sir.ko
+trancevibrator.ko
+turbografx.ko
+twidjoy.ko
+ubifs.ko
+ufs.ko
+umc.ko
+usbip-core.ko
+usbip-host.ko
+uwb.ko
+vcan.ko
+vhci-hcd.ko
+w1_bq27000.ko
+w1_ds2408.ko
+w1_ds2423.ko
+w1_ds2431.ko
+w1_ds2433.ko
+w1_ds2760.ko
+w1_ds2780.ko
+w1_ds2781.ko
+w1_ds28e04.ko
+w1_smem.ko
+w1_therm.ko
+w6692.ko
+walkera0701.ko
+wanrouter.ko
+warrior.ko
+whci.ko
+wire.ko
+yam.ko
+zhenhua.ko

SOURCES/mod-internal.list

@@ -0,0 +1,97 @@
+dmatest
+kunit
+kunit-test
+ext4-inode-test
+list-test
+sysctl-test
+mptcp_crypto_test
+mptcp_token_test
+bitfield_kunit
+cmdline_kunit
+property-entry-test
+qos-test
+resource_kunit
+soc-topology-test
+soc-utils-test
+string-stream-test
+test_linear_ranges
+test_bits
+kasan_test
+time_test
+fat_test
+lib_test
+rational-test
+test_list_sort
+slub_kunit
+kfence_test
+test_hash
+locktorture
+mac80211_hwsim
+netdevsim
+pktgen
+rcutorture
+rocker
+scftorture
+test_klp_atomic_replace
+test_klp_callbacks_demo
+test_klp_callbacks_demo2
+test_klp_callbacks_busy
+test_klp_callbacks_mod
+test_klp_livepatch
+test_klp_shadow_vars
+test_klp_state
+test_klp_state2
+test_klp_state3
+torture
+refscale
+rcuscale
+memcpy_kunit
+dev_addr_lists_test
+test_bpf
+stackinit_kunit
+overflow_kunit
+clk-gate_test
+clk_test
+mtty
+test_hmm
+test_vmalloc
+test_sort
+cpumask_kunit
+iio-test-format
+iio-test-rescale
+cros_kunit
+cpumask_kunit
+drm_buddy_test
+drm_cmdline_parser_test
+drm_damage_helper_test
+drm_dp_mst_helper_test
+drm_format_helper_test
+drm_format_test
+drm_framebuffer_test
+drm_gem_shmem_test
+drm_kunit_helpers
+drm_mm_test
+drm_plane_helper_test
+drm_rect_test
+gss_krb5_test
+drm_connector_test
+drm_managed_test
+drm_modes_test
+drm_probe_helper_test
+input_test
+hashtable_test
+hid-uclogic-test
+strcat_kunit
+strscpy_kunit
+siphash_kunit
+handshake-test
+drm_exec_test
+regmap-kunit
+cfg80211-tests
+mac80211-tests
+wwan_hwsim
+checksum_kunit
+arm-smmu-v3-test
+iwlwifi-tests
+sound_kunit
+amd-pstate-ut

SOURCES/mod-kvm.list

@@ -0,0 +1,5 @@
+kvm-amd
+kvm-intel
+kvm
+kvmgt
+ptp_kvm

SOURCES/mod-partner.list

@@ -0,0 +1,3 @@
+afs
+rxperf
+rxrpc

SOURCES/parallel_xz.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# Reads filenames on stdin, xz-compresses each in place.
+# Not optimal for "compress relatively few, large files" scenario!
+
+# How many xz's to run in parallel:
+procgroup=""
+while test "$#" != 0; do
+	# Get it from -jNUM
+	N="${1#-j}"
+	if test "$N" = "$1"; then
+		# Not -j<something> - warn and ignore
+		echo "parallel_xz: warning: unrecognized argument: '$1'"
+	else
+		procgroup="$N"
+	fi
+	shift
+done
+
+# If told to use only one cpu:
+test "$procgroup" || exec xargs -r xz
+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

SOURCES/partial-clang-debug-snip.config

@@ -1,4 +0,0 @@
-# clang
-# CONFIG_DRM_WERROR is not set
-CONFIG_KASAN_STACK=y
-# CONFIG_KMSAN is not set

SOURCES/partial-clang-snip.config

@@ -1,4 +0,0 @@
-# clang
-# CONFIG_DRM_WERROR is not set
-# CONFIG_KASAN_STACK is not set
-# CONFIG_KMSAN is not set

SOURCES/partial-clang_lto-aarch64-debug-snip.config

@@ -1,4 +0,0 @@
-# clang_lto
-# CONFIG_DRM_WERROR is not set
-CONFIG_KASAN_STACK=y
-# CONFIG_KMSAN is not set

SOURCES/partial-clang_lto-aarch64-snip.config

@@ -1,6 +0,0 @@
-# clang_lto
-# CONFIG_DRM_WERROR is not set
-# CONFIG_KASAN_STACK is not set
-# CONFIG_KMSAN is not set
-CONFIG_LTO_CLANG_THIN=y
-# CONFIG_LTO_NONE is not set

SOURCES/partial-clang_lto-x86_64-debug-snip.config

@@ -1,4 +0,0 @@
-# clang_lto
-# CONFIG_DRM_WERROR is not set
-CONFIG_KASAN_STACK=y
-# CONFIG_KMSAN is not set

SOURCES/partial-clang_lto-x86_64-snip.config

@@ -1,6 +0,0 @@
-# clang_lto
-# CONFIG_DRM_WERROR is not set
-# CONFIG_KASAN_STACK is not set
-# CONFIG_KMSAN is not set
-CONFIG_LTO_CLANG_THIN=y
-# CONFIG_LTO_NONE is not set

SOURCES/partial-kgcov-debug-snip.config

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

SOURCES/partial-kgcov-snip.config

@@ -2,3 +2,4 @@
 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

@@ -148,8 +148,7 @@ parsenewconfigs()
         /usr/bin/awk -v BASE="$tmpdir" '
                 BEGIN { inpatch=0;
 			outfile="none";
-                        symbol="none";
+                        symbol="none"; }
-                        commit=""; }
                 /^Symbol: .*$/ {
                         split($0, a, " ");
                         symbol="CONFIG_"a[2];
@@ -161,11 +160,9 @@ parsenewconfigs()
 			}
                         else {
                                 if (symbol != "none") {
-                                    print "# Commit: "commit >> outfile
                                     system("cat " outfile " " BASE "/" symbol " > " BASE "/tmpf");
                                     system("mv " BASE "/tmpf " BASE "/" symbol);
                                     symbol="none"
-                                    commit=""
 				}
                                 outfile="none"
 				inpatch = 0;
@@ -176,15 +173,6 @@ parsenewconfigs()
                                 print "# "$0 >> outfile;
                         }
                 }
-                /^Defined at .*$/ {
-                        split($0, x, " ");
-                        filenum=x[3];
-                        split(filenum, x, ":");
-                        file=x[1]
-                        line=x[2]
-                        cmd="git blame -L " line "," line " " file " | cut -d \" \" -f1 | xargs git log --pretty=format:\"%C(auto)%h %C(cyan)('%s')\" -1"
-                        cmd | getline commit
-                }
 
 
         ' .helpnewconfig
@@ -205,7 +193,7 @@ 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/${SPECPACKAGE_NAME}${KVERREL}"*.config
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
 	do
 		arch=$(head -1 "$cfg" | cut -b 3-)
 		cfgtmp="${cfg}.tmp"
@@ -316,7 +304,7 @@ function process_configs()
 	[ -f .mismatches ] && rm -f .mismatches
 
 	count=0
-	for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
 	do
 		if [ "$count" -eq 0 ]; then
 			# do the first one by itself so that tools are built
@@ -406,12 +394,6 @@ FLAVOR="$(test -n "$2" && echo "-$2" || echo "-rhel")"
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")
 
-# Config options for RHEL should target the pending-rhel directory, not pending-common.
-if [ "$FLAVOR" = "-rhel" ]
-then
-	FLAVOR="-rhel"
-fi
-
 # to handle this script being a symlink
 cd "$SCRIPT_DIR"
 

SOURCES/rpminspect.yaml

@@ -29,7 +29,7 @@ emptyrpm:
 patches:
     ignore_list:
         - linux-kernel-test.patch
-        - patch-6.11-redhat.patch
+        - patch-5.14-redhat.patch
         - patch-%{patchversion}-redhat.patch
 
 runpath:
@@ -44,10 +44,5 @@ debuginfo:
 
 elf:
     ignore:
-        - /usr/libexec/kselftests/*
         - /usr/libexec/perf-core/tests/shell/coresight/*
         - /usr/lib/debug/usr/libexec/perf-core/tests/shell/coresight/*
-
-annocheck:
-    ignore:
-        - /usr/libexec/kselftests/*

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