3:24 p.m.
From: Clark Williams on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
This MR adds adds the code and data from the ARK os-build-rt branch to build
the kernel-rt real time kernel packages. It also adds the 64k page-size kernel
package for arm64 architecture.
The changes are confined to the 'redhat' directory of the kernel tree.
The MR contains new config directories and script changes for generating
configs, as well as Makefile and specfile changes to generate sub-packages of
the kernel.
The RT logic is currently disabled and will remain so until the remainder of
the PREEMPT_RT patches are merged upstream. Once ARK starts inheriting this
code from Linus' tree, we can enable them and start building rt and automotive
kernels in ARK.
Signed-off-by: Clark Williams <williams(a)redhat.com>
---
redhat/configs/common/debug/arm/aarch64/64k/README
| 0
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_4K_PAGES
| 1 +
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_64K_PAGES
| 1 +
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_48
| 1 +
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_52
| 1 +
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_42
| 1 +
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_48
| 1 +
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_52
| 1 +
redhat/configs/common/generic/arm/aarch64/64k/CONFIG_FORCE_MAX_ZONEORDER
| 3 +
redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_REALTEK
| 1 -
redhat/configs/common/generic/powerpc/CONFIG_HARDLOCKUP_DETECTOR
| 1 -
redhat/configs/common/generic/x86/CONFIG_HARDLOCKUP_DETECTOR
| 1 -
redhat/configs/common/generic/x86/CONFIG_KCSAN
| 1 -
redhat/configs/common/generic/x86/CONFIG_PVPANIC_PCI
| 1 -
redhat/configs/common/generic/CONFIG_SLOB_DEPRECATED
| 1 +
redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_GENERIC
| 1 +
redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_IMX
| 1 +
redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_MSM
| 1 +
redhat/configs/common/rt/debug/arm/aarch64/README
| 0
redhat/configs/common/rt/debug/x86/README
| 0
redhat/configs/common/rt/generic/arm/aarch64/README
| 0
redhat/configs/common/rt/generic/x86/README
| 0
redhat/configs/rhel/debug/CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE
| 1 -
redhat/configs/rhel/debug/CONFIG_CPUMASK_OFFSTACK
| 1 -
redhat/configs/rhel/debug/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT
| 1 -
redhat/configs/rhel/debug/CONFIG_KDB_CONTINUE_CATASTROPHIC
| 1 -
redhat/configs/rhel/debug/CONFIG_PANIC_ON_OOPS
| 1 -
redhat/configs/rhel/debug/CONFIG_USB_XHCI_DBGCAP
| 1 -
redhat/configs/rhel/generic/CONFIG_CAVIUM_ERRATUM_30115 =>
redhat/configs/rhel/generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115 | 0
redhat/configs/rhel/generic/arm/aarch64/CONFIG_DUMMY_CONSOLE_COLUMNS
| 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_DUMMY_CONSOLE_ROWS
| 1 -
redhat/configs/rhel/generic/CONFIG_FSL_ERRATUM_A008585 =>
redhat/configs/rhel/generic/arm/aarch64/CONFIG_FSL_ERRATUM_A008585 | 0
redhat/configs/rhel/generic/CONFIG_FUJITSU_ERRATUM_010001 =>
redhat/configs/rhel/generic/arm/aarch64/CONFIG_FUJITSU_ERRATUM_010001 | 0
redhat/configs/rhel/generic/arm/aarch64/CONFIG_GPIOLIB_FASTPATH_LIMIT
| 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_GPIO_VIPERBOARD
| 1 -
redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161010101 =>
redhat/configs/rhel/generic/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101 | 0
redhat/configs/rhel/generic/arm/aarch64/CONFIG_I2C_SMBUS
| 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_LOG_CPU_MAX_BUF_SHIFT
| 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE
| 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
| 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_PVPANIC_MMIO
| 1 -
redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1003 =>
redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003 | 0
redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1009 =>
redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009 | 0
redhat/configs/rhel/generic/CONFIG_QCOM_QDF2400_ERRATUM_0065 =>
redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065 | 0
redhat/configs/rhel/generic/arm/aarch64/CONFIG_SHMEM
| 1 +
redhat/configs/rhel/generic/arm/aarch64/CONFIG_TCG_INFINEON
| 1 -
redhat/configs/rhel/generic/arm/aarch64/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS
| 1 -
redhat/configs/rhel/generic/powerpc/CONFIG_BLK_DEV_PMEM
| 1 -
redhat/configs/rhel/generic/powerpc/CONFIG_DAX
| 1 -
redhat/configs/rhel/generic/powerpc/CONFIG_FS_DAX
| 1 -
redhat/configs/rhel/generic/powerpc/CONFIG_GPIOLIB_FASTPATH_LIMIT
| 1 -
redhat/configs/rhel/generic/powerpc/CONFIG_LOG_CPU_MAX_BUF_SHIFT
| 1 -
redhat/configs/rhel/generic/powerpc/CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
| 1 -
redhat/configs/rhel/generic/powerpc/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_CONSOLE_LOGLEVEL_DEFAULT
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_DUMMY_CONSOLE_COLUMNS
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_DUMMY_CONSOLE_ROWS
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_GPIOLIB_FASTPATH_LIMIT
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_LOG_CPU_MAX_BUF_SHIFT
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_PM_STD_PARTITION
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_SYSTEM_BLACKLIST_HASH_LIST
| 1 -
redhat/configs/rhel/generic/x86/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS
| 1 -
redhat/configs/rhel/generic/CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE
| 1 +
redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161600802
| 1 -
redhat/configs/rhel/generic/CONFIG_INET_TABLE_PERTURB_ORDER
| 1 +
redhat/configs/rhel/generic/CONFIG_INTEL_TURBO_MAX_3
| 1 -
redhat/configs/rhel/generic/CONFIG_KFENCE_STATIC_KEYS
| 2 +-
redhat/configs/rhel/generic/CONFIG_LIBCRC32C
| 2 +-
redhat/configs/rhel/generic/CONFIG_PROVE_CXL_LOCKING
| 1 -
redhat/configs/rhel/generic/CONFIG_PROVE_NVDIMM_LOCKING
| 1 -
redhat/configs/rhel/generic/CONFIG_SLUB_TINY
| 1 +
redhat/configs/rhel/generic/CONFIG_SND_SOC_RT1318_SDW
| 1 +
redhat/configs/rhel/generic/CONFIG_VIDEO_TC358746
| 1 +
redhat/configs/rhel/rt/debug/x86/CONFIG_ACPI_REDUCED_HARDWARE_ONLY
| 1 +
redhat/configs/rhel/rt/debug/CONFIG_KASAN_INLINE
| 1 +
redhat/configs/rhel/rt/debug/CONFIG_KASAN_OUTLINE
| 1 +
redhat/configs/rhel/rt/debug/CONFIG_PREEMPT_VOLUNTARY
| 1 +
redhat/configs/rhel/rt/generic/arm/aarch64/CONFIG_HI3660_MBOX
| 1 +
redhat/configs/rhel/rt/generic/arm/aarch64/CONFIG_HI6220_MBOX
| 1 +
redhat/configs/rhel/rt/generic/arm/aarch64/CONFIG_STUB_CLK_HI3660
| 1 +
redhat/configs/rhel/rt/generic/arm/aarch64/CONFIG_UNMAP_KERNEL_AT_EL0
| 1 +
redhat/configs/rhel/rt/generic/arm/aarch64/CONFIG_ZONE_DMA32
| 1 +
redhat/configs/rhel/rt/generic/x86/CONFIG_ACPI_REDUCED_HARDWARE_ONLY
| 1 +
redhat/configs/rhel/rt/generic/x86/CONFIG_X86_16BIT
| 1 +
redhat/configs/rhel/rt/generic/x86/CONFIG_X86_SMAP
| 1 +
redhat/configs/rhel/rt/generic/x86/CONFIG_X86_UMIP
| 1 +
redhat/configs/rhel/rt/generic/x86/CONFIG_X86_VSYSCALL_EMULATION
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ADVISE_SYSCALLS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ALLOW_DEV_COREDUMP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_BITS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ATA_FORCE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ATH9K_PCOEM
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ATH9K_RFKILL
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_BASE_FULL
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_BLOCK
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_BUG
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CRDA_SUPPORT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_CONSOLE_TRANSLATIONS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_COREDUMP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_CRAMFS_BLOCKDEV
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DEBUG_BUGVERBOSE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DEBUG_MEMORY_INIT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DEBUG_PREEMPT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DEBUG_RSEQ
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DPM_WATCHDOG
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_DEBUG_MODESET_LOCK
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_DEBUG
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_DEBUG_GUC
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_DEBUG_MMIO
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_DEBUG_RUNTIME_PM
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_FENCE_TIMEOUT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_HEARTBEAT_INTERVAL
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_PREEMPT_TIMEOUT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_REQUEST_TIMEOUT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_SELFTEST
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_STOP_TIMEOUT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_SW_FENCE_CHECK_DAG
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_TIMESLICE_DURATION
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DRM_I915_WERROR
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_ASCOT2E
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_ATBM8830
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_CX22702
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_CX24110
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_CXD2880
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_DIB3000MB
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_DIB3000MC
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_DIB7000M
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_DIB7000P
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_DIB8000
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_DIB9000
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_DS3000
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_HELENE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_HORUS3A
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_IX2505V
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_LGS8GL5
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_LGS8GXX
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_LNBH29
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_LNBP22
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_M88RS2000
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_MB86A16
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_MN88443X
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_NXT6000
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_OR51132
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_OR51211
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_S5H1432
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_SI21XX
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_SP2
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_SP887X
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_STB6000
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_STB6100
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_STV0288
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_TDA665x
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_TUNER_DIB0070
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_TUNER_DIB0090
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_DVB_ZD1301_DEMOD
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_EARLY_PRINTK
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ELF_CORE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_EXPERT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_FILE_LOCKING
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_FIRMWARE_MEMMAP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_GCC_PLUGIN_CYC_COMPLEXITY
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_GPIO_CDEV
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_GPIO_SYSFS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_HARDENED_USERCOPY_PAGESPAN
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_HID_PICOLCD_BACKLIGHT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_HID_PICOLCD_FB
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_HID_PICOLCD_LCD
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_HID_PICOLCD_LEDS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_IO_URING
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ISA_BUS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ISA_DMA_API
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_KFENCE_STRESS_TEST_FAULTS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_KGDB_TESTS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_KVM_WERROR
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MEDIA_TUNER_MAX2165
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MEDIA_TUNER_MSI001
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MEDIA_TUNER_MT2266
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MEDIA_TUNER_MXL301RF
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MEDIA_TUNER_TDA18250
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MLX4_DEBUG
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MODIFY_LDT_SYSCALL
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_ALPS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_BYD
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_CYPRESS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_ELANTECH_SMBUS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_FOCALTECH
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_LIFEBOOK
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_LOGIPS2PP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_SYNAPTICS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_MOUSE_PS2_TRACKPOINT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PC104
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCIE_BUS_DEFAULT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCIE_BUS_PEER2PEER
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCIE_BUS_PERFORMANCE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCIE_BUS_SAFE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCIE_BUS_TUNE_OFF
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCI_CNB20LE_QUIRK
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCI_QUIRKS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PCSPKR_PLATFORM
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_POSIX_TIMERS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_BEHAVIOUR
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_DYNAMIC
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_NONE_BEHAVIOUR
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_VOLUNTARY
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PRINTK
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PROCESSOR_SELECT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PROC_SYSCTL
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_PSTORE_DEFAULT_KMSG_BYTES
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_RANDOMIZE_KSTACK_OFFSET
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_RCU_BOOST
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_RCU_BOOST_DELAY
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_RCU_NOCB_CPU_CB_BOOST
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_RESET_SIMPLE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_RSEQ
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SCHED_AUTOGROUP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SECRETMEM
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SERIAL_8250_DMA
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SERIAL_8250_PNP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SIGNALFD
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SLOB
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SLUB_CPU_PARTIAL
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SLUB_MEMCG_SYSFS_ON
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SND_PCM_TIMER
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SND_PROC_FS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SND_SOC_SDW_MOCKUP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SUSPEND_SKIP_SYNC
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_SYSFS_SYSCALL
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_TIMERFD
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_TRIM_UNUSED_KSYMS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_TTY
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_TTY_PRINTK
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_UNUSED_KSYMS_WHITELIST
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_UNWINDER_GUESS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_AD9389B
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7170
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7175
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7180
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7183
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7343
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7393
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7511
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7604
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ADV7842
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_AK881X
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_BT819
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_BT856
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_BT866
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_CS5345
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_CS53L32A
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_CX25840
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_I2C
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_KS0127
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_M52790
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ML86V7667
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_MSP3400
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_SAA7110
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_SAA711X
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_SAA7127
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_SAA717X
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_SAA7185
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_SONY_BTF_MPX
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_ST_MIPID02
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TC358743
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TDA1997X
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TDA7432
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TDA9840
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TEA6415C
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TEA6420
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_THS7303
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_THS8200
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TLV320AIC23B
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TVAUDIO
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TVP514X
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TVP5150
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TVP7002
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TW2804
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TW9903
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TW9906
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_TW9910
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_UDA1342
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_UPD64031A
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_UPD64083
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_VP27SMPX
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_VPX3220
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_WM8739
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VIDEO_WM8775
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VMLINUX_MAP
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_VM_EVENT_COUNTERS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_WIRELESS_WDS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_WWAN_DEBUGFS
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_XZ_DEC_ARM
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_XZ_DEC_ARMTHUMB
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_XZ_DEC_IA64
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_XZ_DEC_SPARC
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_YENTA_ENE_TUNE
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_YENTA_O2
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_YENTA_RICOH
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_YENTA_TI
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_YENTA_TOSHIBA
| 1 +
redhat/configs/rhel/rt/generic/CONFIG_ZONE_DMA
| 1 +
redhat/configs/priority.common
| 1 +
redhat/configs/priority.rhel
| 8 +-
redhat/rhel_files/filter-modules.sh.rhel
| 6 +-
redhat/rhel_files/mod-kvm.list
| 5 +
redhat/scripts/genspec/genspec.sh
| 1 +
redhat/scripts/mod/mod-kvm.list
| 5 +
redhat/self-test/data/centos-2585cf9dfaad.el7
| 2 +
redhat/self-test/data/centos-2585cf9dfaad.el7.spec
| 1 +
redhat/self-test/data/centos-2585cf9dfaad.fc25
| 2 +
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
| 1 +
redhat/self-test/data/centos-78e36f3b0dae.el7
| 2 +
redhat/self-test/data/centos-78e36f3b0dae.el7.spec
| 1 +
redhat/self-test/data/centos-78e36f3b0dae.fc25
| 2 +
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
| 1 +
redhat/self-test/data/centos-df0cc57e057f.el7
| 2 +
redhat/self-test/data/centos-df0cc57e057f.el7.spec
| 1 +
redhat/self-test/data/centos-df0cc57e057f.fc25
| 2 +
redhat/self-test/data/centos-df0cc57e057f.fc25.spec
| 1 +
redhat/self-test/data/centos-fce15c45d3fb.el7
| 2 +
redhat/self-test/data/centos-fce15c45d3fb.el7.spec
| 1 +
redhat/self-test/data/centos-fce15c45d3fb.fc25
| 2 +
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
| 1 +
redhat/self-test/data/fedora-2585cf9dfaad.el7
| 2 +
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
| 1 +
redhat/self-test/data/fedora-2585cf9dfaad.fc25
| 2 +
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
| 1 +
redhat/self-test/data/fedora-78e36f3b0dae.el7
| 2 +
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
| 1 +
redhat/self-test/data/fedora-78e36f3b0dae.fc25
| 2 +
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
| 1 +
redhat/self-test/data/fedora-df0cc57e057f.el7
| 2 +
redhat/self-test/data/fedora-df0cc57e057f.el7.spec
| 1 +
redhat/self-test/data/fedora-df0cc57e057f.fc25
| 2 +
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
| 1 +
redhat/self-test/data/fedora-fce15c45d3fb.el7
| 2 +
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
| 1 +
redhat/self-test/data/fedora-fce15c45d3fb.fc25
| 2 +
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
| 1 +
redhat/self-test/data/rhel-2585cf9dfaad.el7
| 2 +
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
| 1 +
redhat/self-test/data/rhel-2585cf9dfaad.fc25
| 2 +
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
| 1 +
redhat/self-test/data/rhel-78e36f3b0dae.el7
| 2 +
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
| 1 +
redhat/self-test/data/rhel-78e36f3b0dae.fc25
| 2 +
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec
| 1 +
redhat/self-test/data/rhel-df0cc57e057f.el7
| 2 +
redhat/self-test/data/rhel-df0cc57e057f.el7.spec
| 1 +
redhat/self-test/data/rhel-df0cc57e057f.fc25
| 2 +
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec
| 1 +
redhat/self-test/data/rhel-fce15c45d3fb.el7
| 2 +
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec
| 1 +
redhat/self-test/data/rhel-fce15c45d3fb.fc25
| 2 +
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec
| 1 +
redhat/Makefile
| 2 +
redhat/Makefile.variables
| 1 +
redhat/kernel.spec.template
| 400 ++++++++-
376 files changed, 697 insertions(+), 115 deletions(-)
3:24 p.m.
New subject: [OS-BUILD PATCHv8 1/11] redhat: realtime config entries
From: Clark Williams <williams(a)redhat.com>
redhat: realtime config entries
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/configs/common/rt/debug/arm/aarch64/README
b/redhat/configs/common/rt/debug/arm/aarch64/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/rt/debug/arm/aarch64/README
diff --git a/redhat/configs/common/rt/debug/x86/README
b/redhat/configs/common/rt/debug/x86/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/rt/debug/x86/README
diff --git a/redhat/configs/common/rt/generic/arm/aarch64/README
b/redhat/configs/common/rt/generic/arm/aarch64/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/rt/generic/arm/aarch64/README
diff --git a/redhat/configs/common/rt/generic/x86/README
b/redhat/configs/common/rt/generic/x86/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/rt/generic/x86/README
diff --git a/redhat/configs/rhel/rt/debug/CONFIG_KASAN_INLINE
b/redhat/configs/rhel/rt/debug/CONFIG_KASAN_INLINE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/debug/CONFIG_KASAN_INLINE
@@ -0,0 +1 @@
+# CONFIG_KASAN_INLINE is not set
diff --git a/redhat/configs/rhel/rt/debug/CONFIG_KASAN_OUTLINE
b/redhat/configs/rhel/rt/debug/CONFIG_KASAN_OUTLINE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/debug/CONFIG_KASAN_OUTLINE
@@ -0,0 +1 @@
+CONFIG_KASAN_OUTLINE=y
diff --git a/redhat/configs/rhel/rt/debug/x86/CONFIG_ACPI_REDUCED_HARDWARE_ONLY
b/redhat/configs/rhel/rt/debug/x86/CONFIG_ACPI_REDUCED_HARDWARE_ONLY
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/debug/x86/CONFIG_ACPI_REDUCED_HARDWARE_ONLY
@@ -0,0 +1 @@
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ADVISE_SYSCALLS
b/redhat/configs/rhel/rt/generic/CONFIG_ADVISE_SYSCALLS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_ADVISE_SYSCALLS
@@ -0,0 +1 @@
+CONFIG_ADVISE_SYSCALLS=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ALLOW_DEV_COREDUMP
b/redhat/configs/rhel/rt/generic/CONFIG_ALLOW_DEV_COREDUMP
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_ALLOW_DEV_COREDUMP
@@ -0,0 +1 @@
+CONFIG_ALLOW_DEV_COREDUMP=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_BITS
b/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_BITS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_BITS
@@ -0,0 +1 @@
+CONFIG_ARCH_MMAP_RND_BITS=28
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
b/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
@@ -0,0 +1 @@
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ATA_FORCE
b/redhat/configs/rhel/rt/generic/CONFIG_ATA_FORCE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_ATA_FORCE
@@ -0,0 +1 @@
+CONFIG_ATA_FORCE=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_PCOEM
b/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_PCOEM
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_PCOEM
@@ -0,0 +1 @@
+CONFIG_ATH9K_PCOEM=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_RFKILL
b/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_RFKILL
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_RFKILL
@@ -0,0 +1 @@
+CONFIG_ATH9K_RFKILL=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_BASE_FULL
b/redhat/configs/rhel/rt/generic/CONFIG_BASE_FULL
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_BASE_FULL
@@ -0,0 +1 @@
+CONFIG_BASE_FULL=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_BLOCK
b/redhat/configs/rhel/rt/generic/CONFIG_BLOCK
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_BLOCK
@@ -0,0 +1 @@
+CONFIG_BLOCK=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_BUG
b/redhat/configs/rhel/rt/generic/CONFIG_BUG
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_BUG
@@ -0,0 +1 @@
+CONFIG_BUG=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
b/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
@@ -0,0 +1 @@
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CRDA_SUPPORT
b/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CRDA_SUPPORT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CRDA_SUPPORT
@@ -0,0 +1 @@
+CONFIG_CFG80211_CRDA_SUPPORT=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_CONSOLE_TRANSLATIONS
b/redhat/configs/rhel/rt/generic/CONFIG_CONSOLE_TRANSLATIONS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/generic/CONFIG_CONSOLE_TRANSLATIONS
@@ -0,0 +1 @@
+CONFIG_CONSOLE_TRANSLATIONS=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 2/11] redhat: miscellaneous commits needed due to
CONFIG_EXPERT
From: Clark Williams <williams(a)redhat.com>
redhat: miscellaneous commits needed due to CONFIG_EXPERT
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_SLOB_DEPRECATED
b/redhat/configs/common/generic/CONFIG_SLOB_DEPRECATED
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_SLOB_DEPRECATED
@@ -0,0 +1 @@
+# CONFIG_SLOB_DEPRECATED is not set
diff --git a/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_GENERIC
b/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_GENERIC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_GENERIC
@@ -0,0 +1 @@
+CONFIG_USB_CHIPIDEA_GENERIC=m
diff --git a/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_IMX
b/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_IMX
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_IMX
@@ -0,0 +1 @@
+CONFIG_USB_CHIPIDEA_IMX=m
diff --git a/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_MSM
b/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_MSM
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_USB_CHIPIDEA_MSM
@@ -0,0 +1 @@
+CONFIG_USB_CHIPIDEA_MSM=m
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_REALTEK
b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_REALTEK
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_REALTEK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_REALTEK is not set
diff --git a/redhat/configs/common/generic/powerpc/CONFIG_HARDLOCKUP_DETECTOR
b/redhat/configs/common/generic/powerpc/CONFIG_HARDLOCKUP_DETECTOR
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/powerpc/CONFIG_HARDLOCKUP_DETECTOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HARDLOCKUP_DETECTOR=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_HARDLOCKUP_DETECTOR
b/redhat/configs/common/generic/x86/CONFIG_HARDLOCKUP_DETECTOR
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/x86/CONFIG_HARDLOCKUP_DETECTOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HARDLOCKUP_DETECTOR=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_KCSAN
b/redhat/configs/common/generic/x86/CONFIG_KCSAN
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/x86/CONFIG_KCSAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KCSAN is not set
diff --git a/redhat/configs/common/generic/x86/CONFIG_PVPANIC_PCI
b/redhat/configs/common/generic/x86/CONFIG_PVPANIC_PCI
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/x86/CONFIG_PVPANIC_PCI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PVPANIC_PCI is not set
diff --git a/redhat/configs/rhel/debug/CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE
b/redhat/configs/rhel/debug/CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/debug/CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
diff --git a/redhat/configs/rhel/debug/CONFIG_CPUMASK_OFFSTACK
b/redhat/configs/rhel/debug/CONFIG_CPUMASK_OFFSTACK
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/debug/CONFIG_CPUMASK_OFFSTACK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CPUMASK_OFFSTACK=y
diff --git a/redhat/configs/rhel/debug/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT
b/redhat/configs/rhel/debug/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/debug/CONFIG_DEFAULT_HUNG_TASK_TIMEOUT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
diff --git a/redhat/configs/rhel/debug/CONFIG_KDB_CONTINUE_CATASTROPHIC
b/redhat/configs/rhel/debug/CONFIG_KDB_CONTINUE_CATASTROPHIC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/debug/CONFIG_KDB_CONTINUE_CATASTROPHIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KDB_CONTINUE_CATASTROPHIC=0
diff --git a/redhat/configs/rhel/debug/CONFIG_PANIC_ON_OOPS
b/redhat/configs/rhel/debug/CONFIG_PANIC_ON_OOPS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/debug/CONFIG_PANIC_ON_OOPS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PANIC_ON_OOPS is not set
diff --git a/redhat/configs/rhel/debug/CONFIG_USB_XHCI_DBGCAP
b/redhat/configs/rhel/debug/CONFIG_USB_XHCI_DBGCAP
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/debug/CONFIG_USB_XHCI_DBGCAP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_USB_XHCI_DBGCAP is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE
b/redhat/configs/rhel/generic/CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE
@@ -0,0 +1 @@
+CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500
diff --git a/redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161600802
b/redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161600802
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161600802
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HISILICON_ERRATUM_161600802=y
diff --git a/redhat/configs/rhel/generic/CONFIG_INET_TABLE_PERTURB_ORDER
b/redhat/configs/rhel/generic/CONFIG_INET_TABLE_PERTURB_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_INET_TABLE_PERTURB_ORDER
@@ -0,0 +1 @@
+CONFIG_INET_TABLE_PERTURB_ORDER=16
diff --git a/redhat/configs/rhel/generic/CONFIG_INTEL_TURBO_MAX_3
b/redhat/configs/rhel/generic/CONFIG_INTEL_TURBO_MAX_3
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_INTEL_TURBO_MAX_3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_TURBO_MAX_3=y
diff --git a/redhat/configs/rhel/generic/CONFIG_KFENCE_STATIC_KEYS
b/redhat/configs/rhel/generic/CONFIG_KFENCE_STATIC_KEYS
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_KFENCE_STATIC_KEYS
+++ b/redhat/configs/rhel/generic/CONFIG_KFENCE_STATIC_KEYS
@@ -1 +1 @@
-CONFIG_KFENCE_STATIC_KEYS=n
+# CONFIG_KFENCE_STATIC_KEYS is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 3/11] redhat: RT packaging changes
From: Clark Williams <williams(a)redhat.com>
redhat: RT packaging changes
Apply changes for building RT kernels to the redhat directory files.
This works is prepratory to the upstream merge of the PREEMPT_RT code.
Introduce new specfile macro with_realtime to control whether the
realtime kernel variant will be built and packaged. All sections of
the specfile that focus on the realtime variant are protected by
this macro. Also, modify most of the variant helper macros to handle
rt variant.
Also add with_rtonly macro for building just the RT variant.
Note that the RT kernel adds an extra package named kernel-rt-kvm,
which contains the KVM modules, due to supporting virtualization on RT
as a separate product.
Modify redhat/Makefile.variables to set INCLUDE_RT_FILES for use by
genspec.sh when generating the specfile from the template specfile.
Config file generation logic changes were done to
redhat/configs/priority.rhel to describe the config files for the rt
kernels.
Modify priority.rhel to have rt inherit from rhel
Due to the way the config merge scripts work an empty
rt directory tree needs to be maintained under common. Empty README
files will be used to keep those directory trees in git.
Don't run '/sbin/ldconfig -X' if we're a noarch or a non-build arch
since there won't be any shared library changes to update the cache
move rt config defines to be in sequence with the other Sources numbers
in the specfile
The variable with_dbgonly means to only build the main kernel debug
package; don't build rt debug packages when it's set.
Don't expand %files macro for rt when with_dbgonly specified
If with_rtonly is specified, turn off the with_efiuki variable.
Also, turn off debuginfo with rtonly
remove unneeded rm of localversion-rt in specfile
Change the %license reference in the kernel_variant_files macro to
be %%license to change a weird failure when doing with_rtonly builds
Signed-off-by: Jiri Benc <jbenc(a)redhat.com>
Signed-off-by: Andrew Halaney <ahalaney(a)redhat.com>
Signed-off-by: Clark Williams <williams(a)redhat.com>
Signed-off-by: Wander Lairson Costa <wander(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -12,6 +12,7 @@ include Makefile.variables
SPECRELEASED_KERNEL=$(RELEASED_KERNEL)
SPECINCLUDE_FEDORA_FILES=$(INCLUDE_FEDORA_FILES)
SPECINCLUDE_RHEL_FILES=$(INCLUDE_RHEL_FILES)
+SPECINCLUDE_RT_FILES=$(INCLUDE_RT_FILES)
ifneq (,$(findstring n,$(firstword -$(MAKEFLAGS))))
# Do not set RHTEST on the command line. Use the make command built-in options
@@ -695,6 +696,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source
dist-configs-check
scripts/mod/mod-internal.list \
scripts/mod/mod-partner.list \
scripts/mod/mod-sign.sh \
+ scripts/mod/mod-kvm.list \
configs/flavors \
configs/generate_all_configs.sh \
configs/merge.py \
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -68,6 +68,7 @@ HEAD ?= HEAD
# to '0'.
INCLUDE_FEDORA_FILES:=1
INCLUDE_RHEL_FILES:=1
+INCLUDE_RT_FILES:=1
# This variable is the location of the KABI cross compilers
KABI_CROSS_COMPILE_PREFIX ?= /usr/bin/
diff --git a/redhat/configs/priority.rhel b/redhat/configs/priority.rhel
index blahblah..blahblah 100644
--- a/redhat/configs/priority.rhel
+++ b/redhat/configs/priority.rhel
@@ -23,6 +23,8 @@ EMPTY=armv7hl armv7hl-debug armv7hl-lpae armv7hl-lpae-debug
x86_64=generic:generic-x86
x86_64-debug=generic:generic-x86:debug:debug-x86
x86_64-kgcov=generic:generic-x86:kgcov
+x86_64-rt=generic:generic-x86:rt-generic:rt-generic-x86
+x86_64-rt_debug=generic:generic-x86:debug:debug-x86:rt-generic:rt-generic-x86:rt-debug:rt-debug-x86
# ppc64le
ppc64le=generic:generic-powerpc
@@ -37,5 +39,7 @@ s390x-kgcov=generic:generic-s390x:kgcov
# aarch64
aarch64=generic:generic-arm:generic-arm-aarch64
-aarch64-debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm-aarch64
+aarch64-debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm:debug-arm-aarch64
aarch64-kgcov=generic:generic-arm:generic-arm-aarch64:kgcov
+aarch64-rt=generic:generic-arm:generic-arm-aarch64:rt-generic:rt-generic-arm:rt-generic-arm-aarch64
+aarch64-rt_debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm:debug-arm-aarch64:rt-generic:rt-generic-arm:rt-generic-arm-aarch64:rt-debug:rt-debug-arm:rt-debug-arm-aarch64
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -130,6 +130,8 @@ Summary: The Linux kernel
%global include_fedora %%SPECINCLUDE_FEDORA_FILES%%
# Include RHEL files
%global include_rhel %%SPECINCLUDE_RHEL_FILES%%
+# Include RT files
+%global include_rt %%SPECINCLUDE_RT_FILES%%
# Provide Patchlist.changelog file
%global patchlist_changelog %%SPECPATCHLIST_CHANGELOG%%
# Set released_kernel to 1 when the upstream source tarball contains a
@@ -210,6 +212,8 @@ Summary: The Linux kernel
%define with_paeonly %{?_with_paeonly: 1} %{?!_with_paeonly: 0}
# Only build the debug kernel (--with dbgonly):
%define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0}
+# Only build the realtime kernel (--with rtonly):
+%define with_rtonly %{?_with_rtonly: 1} %{?!_with_rtonly: 0}
# Control whether we perform a compat. check against published ABI.
%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1}
# Temporarily disable kabi checks until RC.
@@ -252,6 +256,11 @@ Summary: The Linux kernel
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
+# special purpose variants
+
+# RHEL real-time kernel (PREEMPT_RT)
+%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1}
+
%ifarch x86_64
%define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1}
%else
@@ -272,6 +281,8 @@ Summary: The Linux kernel
%define with_bpftool 0
# selftests turns on bpftool
%define with_selftests 0
+# No realtime fedora variants
+%define with_realtime 0
%endif
%if %{with_verbose}
@@ -353,10 +364,16 @@ Summary: The Linux kernel
%define with_pae 0
%endif
+# RT kernel is only built on x86_64 and aarch64
+%ifnarch x86_64 aarch64
+%define with_realtime 0
+%endif
+
# if requested, only build base kernel
%if %{with_baseonly}
%define with_pae 0
%define with_debug 0
+%define with_realtime 0
%define with_vdso_install 0
%define with_perf 0
%define with_tools 0
@@ -372,11 +389,13 @@ Summary: The Linux kernel
%if %{with_paeonly}
%define with_up 0
%define with_debug 0
+%define with_realtime 0
%endif
# if requested, only build debug kernel
%if %{with_dbgonly}
%define with_up 0
+%define with_realtime 0
%define with_vdso_install 0
%define with_perf 0
%define with_tools 0
@@ -388,6 +407,26 @@ Summary: The Linux kernel
%define with_ipaclones 0
%endif
+# if requested, only build realtime kernel
+%if %{with_rtonly}
+%define with_realtime 1
+%define with_up 0
+%define with_pae 0
+%define with_debug 0
+%define with_debuginfo 0
+%define with_vdso_install 0
+%define with_perf 0
+%define with_tools 0
+%define with_bpftool 0
+%define with_kernel_abi_stablelists 0
+%define with_selftests 0
+%define with_cross 0
+%define with_cross_headers 0
+%define with_ipaclones 0
+%define with_headers 0
+%define with_efiuki 0
+%endif
+
# turn off kABI DUP check and DWARF-based check if kABI check is disabled
%if !%{with_kabichk}
%define with_kabidupchk 0
@@ -425,6 +464,7 @@ Summary: The Linux kernel
# don't build noarch kernels or headers (duh)
%ifarch noarch
%define with_up 0
+%define with_realtime 0
%define with_headers 0
%define with_cross_headers 0
%define with_tools 0
@@ -535,6 +575,7 @@ Summary: The Linux kernel
%define with_debug 0
%define with_pae 0
%define with_zfcpdump 0
+%define with_realtime 0
%define with_debuginfo 0
%define with_perf 0
@@ -875,6 +916,8 @@ Source85: mod-partner.list
Source86: dracut-virt.conf
+Source87: flavors
+
Source100: rheldup3.x509
Source101: rhelkpatch1.x509
@@ -893,6 +936,17 @@ Source213: Module.kabi_dup_x86_64
Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2
Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2
+# RT specific virt module
+Source400: mod-kvm.list
+
+%if %{include_rt}
+# realtime config files
+Source474: %{name}-aarch64-rt-rhel.config
+Source475: %{name}-aarch64-rt_debug-rhel.config
+Source476: %{name}-x86_64-rt-rhel.config
+Source477: %{name}-x86_64-rt_debug-rhel.config
+%endif
+
# Sources for kernel-tools
Source2002: kvm_stat.logrotate
@@ -1375,11 +1429,32 @@ summary: kernel meta-package for the %{1} kernel\
Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{1}\
Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{1}\
Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{1}\
+%if "%{1}" == "rt" || "%{1}" == "rt_debug"\
+Requires: realtime-setup\
+%endif\
Provides: installonlypkg(kernel)\
%description %{1}\
The meta-package for the %{1} kernel\
%{nil}
+%if %{with_realtime}
+#
+# this macro creates a kernel-rt-<subpackage>-kvm package
+# %%kernel_kvm_package <subpackage>
+#
+%define kernel_kvm_package() \
+%package %{?1:%{1}-}kvm\
+Summary: KVM modules for package kernel%{?1:-%{1}}\
+Group: System Environment/Kernel\
+Requires: kernel%{?1:-%{1}} = %{version}-%{release}\
+Provides: installonlypkg(kernel-module)\
+Provides: kernel%{?1:-%{1}}-kvm-%{_target_cpu} = %{version}-%{release}\
+AutoReq: no\
+%description -n kernel%{?1:-%{1}}-kvm\
+This package provides KVM modules for package kernel%{?1:-%{1}}.\
+%{nil}
+%endif
+
#
# This macro creates a kernel-<subpackage> and its -devel and -debuginfo too.
# %%define variant_summary The Linux kernel compiled for <configuration>
@@ -1410,6 +1485,9 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r =
%{KVERREL}%{?1:+%{1}}\
%endif\
%{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
%endif\
+%if "%{1}" == "rt" || "%{1}" == "rt_debug"\
+%{expand:%%kernel_kvm_package %{?1:%{1}}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
+%endif \
%if %{with_efiuki}\
%package %{?1:%{1}-}uki-virt\
Summary: %{variant_summary} unified kernel image for virtual machines\
@@ -1446,6 +1524,14 @@ This package provides kernel modules for the %{?2:%{2} }kernel
package for Red H
# Now, each variant package.
+%if %{with_realtime}
+%define variant_summary The Linux kernel compiled with PREEMPT_RT
+%kernel_variant_package rt
+%description rt-core
+This package includes a version of the Linux kernel compiled with the
+PREEMPT_RT real-time preemption support
+%endif
+
%if %{with_pae}
%define variant_summary The Linux kernel compiled for Cortex-A15
%kernel_variant_package lpae
@@ -1479,6 +1565,21 @@ This variant of the kernel has numerous debugging options enabled.
It should only be installed when trying to gather additional information
on kernel bugs, as some of these options impact performance noticably.
+%if %{with_debug} && %{with_realtime}
+%define variant_summary The Linux PREEMPT_RT kernel compiled with extra debugging
enabled
+%kernel_variant_package rt_debug
+%description rt_debug-core
+The kernel package contains the Linux kernel (vmlinuz), the core of any
+Linux operating system. The kernel handles the basic functions
+of the operating system: memory allocation, process allocation, device
+input and output, etc.
+
+This variant of the kernel has numerous debugging options enabled.
+It should only be installed when trying to gather additional information
+on kernel bugs, as some of these options impact performance noticably.
+%endif
+
+%if %{with_up}
# And finally the main -core package
%define variant_summary The Linux kernel
@@ -1488,6 +1589,7 @@ The kernel package contains the Linux kernel (vmlinuz), the core of
any
Linux operating system. The kernel handles the basic functions
of the operating system: memory allocation, process allocation, device
input and output, etc.
+%endif
%if %{with_efiuki}
%description debug-uki-virt
@@ -2232,6 +2334,10 @@ BuildKernel() {
# Identify modules in the kernel-modules-partner package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner
%endif
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ # Identify modules in the kernel-rt-kvm package
+ %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE400} kvm
+ fi
#
# Generate the kernel-core and kernel-modules files lists
@@ -2253,6 +2359,10 @@ BuildKernel() {
# don't include anything going into kernel-modules-partner in the file lists
xargs rm -rf < mod-partner.list
%endif
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ # don't include anything going into kernel-rt-kvm in the file lists
+ xargs rm -rf < mod-kvm.list
+ fi
if [ $DoModules -eq 1 ]; then
# Find all the module files and filter them out into the core and
@@ -2346,6 +2456,9 @@ BuildKernel() {
sed -e 's/^lib*/%dir \/lib/' %{?zipsed} $RPM_BUILD_ROOT/module-dirs.list >
../kernel${Variant:+-${Variant}}-modules-core.list
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >>
../kernel${Variant:+-${Variant}}-modules-core.list
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-extra.list >>
../kernel${Variant:+-${Variant}}-modules-extra.list
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-kvm.list >>
../kernel${Variant:+-${Variant}}-kvm.list
+ fi
# Cleanup
rm -f $RPM_BUILD_ROOT/k-d.list
@@ -2356,6 +2469,9 @@ BuildKernel() {
%if 0%{!?fedora:1}
rm -f $RPM_BUILD_ROOT/mod-partner.list
%endif
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ rm -f $RPM_BUILD_ROOT/mod-kvm.list
+ fi
%if %{signmodules}
if [ $DoModules -eq 1 ]; then
@@ -2436,8 +2552,16 @@ cd linux-%{KVERREL}
%if %{with_debug}
+%if %{with_realtime} && !%{with_dbgonly}
+echo "building rt_debug"
+BuildKernel %make_target %kernel_image %{_use_vdso} rt_debug
+%endif
+
+%if %{with_up}
+echo "building main debug package"
BuildKernel %make_target %kernel_image %{_use_vdso} debug
%endif
+%endif
%if %{with_zfcpdump}
BuildKernel %make_target %kernel_image %{_use_vdso} zfcpdump
@@ -2451,8 +2575,12 @@ BuildKernel %make_target %kernel_image %{use_vdso} lpae
BuildKernel %make_target %kernel_image %{_use_vdso}
%endif
-%ifnarch noarch i686
-%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} &&
!%{with_up}
+%if %{with_realtime}
+BuildKernel %make_target %kernel_image %{_use_vdso} rt
+%endif
+
+%ifnarch noarch i686 %{nobuildarches}
+%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} &&
!%{with_up} && !%{with_realtime}
# If only building the user space tools, then initialize the build environment
# and some variables so that the various userspace tools can be built.
InitBuildVars
@@ -2601,7 +2729,12 @@ find Documentation -type d | xargs chmod u+w
%{modsign_cmd} certs/signing_key.pem.sign+lpae certs/signing_key.x509.sign+lpae
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+lpae/ \
fi \
if [ "%{with_debug}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
+ if [ "%{with_realtime}" -ne "0" ]; then \
+ %{modsign_cmd} certs/signing_key.pem.sign+rt_debug
certs/signing_key.x509.sign+rt_debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt_debug/ \
+ fi \
+ if [ "%{with_up}" -ne "0" ]; then \
+ %{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
+ fi \
fi \
if [ "%{with_up}" -ne "0" ]; then \
%{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
@@ -2622,7 +2755,7 @@ find Documentation -type d | xargs chmod u+w
%if %{with_debuginfo}
-%ifnarch noarch
+%ifnarch noarch %{nobuildarches}
%global __debug_package 1
%files -f debugfiles.list debuginfo-common-%{_target_cpu}
%endif
@@ -2990,6 +3123,21 @@ fi\
/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
%{nil}
+%if %{with_realtime}
+#
+# This macro defines a %%post script for a kernel*-kvm package.
+# It also defines a %%postun script that does the same thing.
+# %%kernel_kvm_post [<subpackage>]
+#
+%define kernel_kvm_post() \
+%{expand:%%post %{?1:%{1}-}kvm}\
+/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+%{nil}\
+%{expand:%%postun %{?1:%{1}-}kvm}\
+/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+%{nil}
+%endif
+
#
# This macro defines a %%post script for a kernel*-modules package.
# It also defines a %%postun script that does the same thing.
@@ -3107,8 +3255,10 @@ fi\
%kernel_uki_virt_scripts
%endif
+%if %{with_up}
%kernel_variant_preun
%kernel_variant_post -r kernel-smp
+%endif
%if %{with_pae}
%kernel_variant_preun lpae
@@ -3128,10 +3278,23 @@ fi\
%kernel_variant_post -v zfcpdump
%endif
+%if %{with_realtime}
+%kernel_variant_preun rt
+%kernel_variant_post -v rt -r (kernel|kernel-smp)
+%kernel_kvm_post rt
+%if %{with_debug}
+%kernel_variant_preun rt_debug
+%kernel_variant_post -v rt_debug
+%kernel_kvm_post rt_debug
+%endif
+%endif
+
+%ifnarch noarch %{nobuildarches}
if [ -x /sbin/ldconfig ]
then
/sbin/ldconfig -X || exit $?
fi
+%endif
###
### file lists
@@ -3310,7 +3473,7 @@ fi
%if %{2}\
%{expand:%%files %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\
%{!?_licensedir:%global license %%doc}\
-%license linux-%{KVERREL}/COPYING-%{version}-%{release}\
+%%license linux-%{KVERREL}/COPYING-%{version}-%{release}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\
%ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \
@@ -3358,6 +3521,9 @@ fi
%{expand:%%files %{?3:%{3}-}modules-partner}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/partner\
%endif\
+%if "%{3}" == "rt" || "%{3}" == "rt_debug"\
+%{expand:%%files -f %{name}-%{?3:%{3}-}kvm.list %{?3:%{3}-}kvm}\
+%endif\
%if %{with_debuginfo}\
%ifnarch noarch\
%{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\
@@ -3384,6 +3550,11 @@ fi
%{nil}
%kernel_variant_files %{_use_vdso} %{with_up}
+%if %{with_debug}
+%if %{with_realtime} && !%{with_dbgonly}
+%kernel_variant_files %{_use_vdso} %{with_debug} rt_debug
+%endif
+%if %{with_up}
%kernel_variant_files %{_use_vdso} %{with_debug} debug
%if %{with_debug_meta}
%files debug
@@ -3394,8 +3565,11 @@ fi
%files debug-modules-core
%files debug-modules-extra
%endif
+%endif
+%endif
%kernel_variant_files %{use_vdso} %{with_pae} lpae
%kernel_variant_files %{_use_vdso} %{with_zfcpdump} zfcpdump
+%kernel_variant_files %{_use_vdso} %{with_realtime} rt
%define kernel_variant_ipaclones(k:) \
%if %{1}\
diff --git a/redhat/rhel_files/filter-modules.sh.rhel
b/redhat/rhel_files/filter-modules.sh.rhel
index blahblah..blahblah 100755
--- a/redhat/rhel_files/filter-modules.sh.rhel
+++ b/redhat/rhel_files/filter-modules.sh.rhel
@@ -39,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 chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp
hid-asus nct6775 ntc_thermistor video apple_bl"
+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 apple_bl kasan_test"
# Grab the arch-specific filter list overrides
source ./filter-$2.sh
@@ -57,7 +57,7 @@ filter_dir() {
grep -e "${dir}/" ${filelist} >> k-d.list
mv ${filelist}.tmp $filelist
fi
-
+
return 0
}
@@ -74,7 +74,7 @@ filter_ko() {
grep -e "${mod}.ko" ${filelist} >> k-d.list
mv ${filelist}.tmp $filelist
fi
-
+
return 0
}
diff --git a/redhat/rhel_files/mod-kvm.list b/redhat/rhel_files/mod-kvm.list
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/rhel_files/mod-kvm.list
@@ -0,0 +1,5 @@
+kvm-amd
+kvm-intel
+kvm
+kvmgt
+ptp_kvm
diff --git a/redhat/scripts/genspec/genspec.sh b/redhat/scripts/genspec/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/genspec/genspec.sh
+++ b/redhat/scripts/genspec/genspec.sh
@@ -53,6 +53,7 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%SPECINCLUDE_FEDORA_FILES%%/$SPECINCLUDE_FEDORA_FILES/
s/%%SPECINCLUDE_RHEL_FILES%%/$SPECINCLUDE_RHEL_FILES/
s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/
+ s/%%SPECINCLUDE_RT_FILES%%/$SPECINCLUDE_RT_FILES/
s/%%SPECVERSION%%/$SPECVERSION/
s/%%SPECRPMVERSION%%/$SPECRPMVERSION/
s/%%SPECKABIVERSION%%/$SPECKABIVERSION/
diff --git a/redhat/scripts/mod/mod-kvm.list b/redhat/scripts/mod/mod-kvm.list
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/scripts/mod/mod-kvm.list
@@ -0,0 +1,5 @@
+kvm-amd
+kvm-intel
+kvm
+kvmgt
+ptp_kvm
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 4/11] redhat: moved ARM errata configs to arm dir
From: Clark Williams <williams(a)redhat.com>
redhat: moved ARM errata configs to arm dir
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/configs/rhel/generic/CONFIG_CAVIUM_ERRATUM_30115
b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115
rename from redhat/configs/rhel/generic/CONFIG_CAVIUM_ERRATUM_30115
rename to redhat/configs/rhel/generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_CAVIUM_ERRATUM_30115
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_CAVIUM_ERRATUM_30115
diff --git a/redhat/configs/rhel/generic/CONFIG_FSL_ERRATUM_A008585
b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_FSL_ERRATUM_A008585
rename from redhat/configs/rhel/generic/CONFIG_FSL_ERRATUM_A008585
rename to redhat/configs/rhel/generic/arm/aarch64/CONFIG_FSL_ERRATUM_A008585
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_FSL_ERRATUM_A008585
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_FSL_ERRATUM_A008585
diff --git a/redhat/configs/rhel/generic/CONFIG_FUJITSU_ERRATUM_010001
b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_FUJITSU_ERRATUM_010001
rename from redhat/configs/rhel/generic/CONFIG_FUJITSU_ERRATUM_010001
rename to redhat/configs/rhel/generic/arm/aarch64/CONFIG_FUJITSU_ERRATUM_010001
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_FUJITSU_ERRATUM_010001
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_FUJITSU_ERRATUM_010001
diff --git a/redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161010101
b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101
rename from redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161010101
rename to redhat/configs/rhel/generic/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_HISILICON_ERRATUM_161010101
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_HISILICON_ERRATUM_161010101
diff --git a/redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1003
b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003
rename from redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1003
rename to redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1003
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1003
diff --git a/redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1009
b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009
rename from redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1009
rename to redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_QCOM_FALKOR_ERRATUM_1009
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_FALKOR_ERRATUM_1009
diff --git a/redhat/configs/rhel/generic/CONFIG_QCOM_QDF2400_ERRATUM_0065
b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065
rename from redhat/configs/rhel/generic/CONFIG_QCOM_QDF2400_ERRATUM_0065
rename to redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_QCOM_QDF2400_ERRATUM_0065
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_QCOM_QDF2400_ERRATUM_0065
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 5/11] redhat: TEMPORARY default realtime to off
From: Clark Williams <williams(a)redhat.com>
redhat: TEMPORARY default realtime to off
Building of realtime kernel is controlled by the variable
with_realtime in the specfile.
Default this to off until PREEMPT_RT merges upstream so
we pull in the actual code/config changes require to build a
PREEMPT_RT kernel
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -259,7 +259,7 @@ Summary: The Linux kernel
# special purpose variants
# RHEL real-time kernel (PREEMPT_RT)
-%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1}
+%define with_realtime %{?_without_realtime: 1} %{?!_without_realtime: 0}
%ifarch x86_64
%define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 6/11] redhat: TEMPORARY set configs to deal with
PREEMPT_RT
not available
From: Clark Williams <williams(a)redhat.com>
redhat: TEMPORARY set configs to deal with PREEMPT_RT not available
These config values in rt have been changed to handle there
not being PREEMPT_RT configury logic (yet). When PREEMPT_RT merges
upstream, drop this commit.
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/configs/rhel/rt/debug/CONFIG_PREEMPT_VOLUNTARY
b/redhat/configs/rhel/rt/debug/CONFIG_PREEMPT_VOLUNTARY
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/rt/debug/CONFIG_PREEMPT_VOLUNTARY
@@ -0,0 +1 @@
+CONFIG_PREEMPT_VOLUNTARY=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_DYNAMIC
b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_DYNAMIC
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_DYNAMIC
+++ b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_DYNAMIC
@@ -1 +1 @@
-# CONFIG_PREEMPT_DYNAMIC is not set
+CONFIG_PREEMPT_DYNAMIC=y
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
+++ b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_RT
@@ -1 +1 @@
-CONFIG_PREEMPT_RT=y
+# CONFIG_PREEMPT_RT is not set
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_VOLUNTARY
b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_VOLUNTARY
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_VOLUNTARY
+++ b/redhat/configs/rhel/rt/generic/CONFIG_PREEMPT_VOLUNTARY
@@ -1 +1 @@
-# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT_VOLUNTARY=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 7/11] arm64-64k: Add new kernel variant to
RHEL9/CS9 for 64K
page-size'd ARM64
From: Donald Dutile <ddutile(a)redhat.com>
arm64-64k: Add new kernel variant to RHEL9/CS9 for 64K page-size'd ARM64
Modifications to spec file generation files for arm64 64K pagesize kernel;
add 64k variant CONFIG files.
Modelled after expected changes for RT variant in RHEL-9.3.
Added lua macro to kernel.spec.template that was provided
by kmaint team (Herton), and tested in updated RT variant MR
for 9.3.
Todo: Update ARK kernel so upstream-based kernel comparisons can be done.
Testing:
1) Simple boot testing on Ampere-based, Mt. Snow server
2) Forced crash dump via sysfs to ensure kexec, kdump & crash
all work.
3) Compared .config files btwn -64k and existing (-4k) aarch64
to ensure only page-size-related changes in the configs.
4) Checked build.log of brew'd kernel rpms to verify
signature file usage for each respective kernel variant:
std, -debug, -64k, -64k-debug.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2153073
Upstream Status: RHEL only
Signed-off-by: Donald Dutile <ddutile(a)redhat.com>
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/configs/common/debug/arm/aarch64/64k/README
b/redhat/configs/common/debug/arm/aarch64/64k/README
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/debug/arm/aarch64/64k/README
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_4K_PAGES
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_4K_PAGES
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_4K_PAGES
@@ -0,0 +1 @@
+# CONFIG_ARM64_4K_PAGES is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_64K_PAGES
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_64K_PAGES
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_64K_PAGES
@@ -0,0 +1 @@
+CONFIG_ARM64_64K_PAGES=y
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_48
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_48
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_48
@@ -0,0 +1 @@
+# CONFIG_ARM64_PA_BITS_48 is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_52
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_52
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_PA_BITS_52
@@ -0,0 +1 @@
+CONFIG_ARM64_PA_BITS_52=y
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_42
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_42
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_42
@@ -0,0 +1 @@
+# CONFIG_ARM64_VA_BITS_42 is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_48
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_48
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_48
@@ -0,0 +1 @@
+CONFIG_ARM64_VA_BITS_48=y
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_52
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_52
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_ARM64_VA_BITS_52
@@ -0,0 +1 @@
+# CONFIG_ARM64_VA_BITS_52 is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_FORCE_MAX_ZONEORDER
b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_FORCE_MAX_ZONEORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/64k/CONFIG_FORCE_MAX_ZONEORDER
@@ -0,0 +1,3 @@
+# This relies on an out of tree patch to arch/arm64/Kconfig
+# Otherwise, we would be stuck with a default of 11
+CONFIG_FORCE_MAX_ZONEORDER=14
diff --git a/redhat/configs/priority.common b/redhat/configs/priority.common
index blahblah..blahblah 100644
--- a/redhat/configs/priority.common
+++ b/redhat/configs/priority.common
@@ -17,6 +17,7 @@ s390x-zfcpdump=generic:generic-s390x:generic-s390x-zfcpdump
# aarch64
aarch64=generic:generic-arm:generic-arm-aarch64
aarch64-debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm-aarch64
+aarch64-64k-debug=generic:generic-arm:generic-arm-aarch64:generic-arm-aarch64-64k:debug:debug-arm-aarch64:debug-arm-aarch64-64k
# arm
armv7hl=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-armv7
diff --git a/redhat/configs/priority.rhel b/redhat/configs/priority.rhel
index blahblah..blahblah 100644
--- a/redhat/configs/priority.rhel
+++ b/redhat/configs/priority.rhel
@@ -24,7 +24,7 @@ x86_64=generic:generic-x86
x86_64-debug=generic:generic-x86:debug:debug-x86
x86_64-kgcov=generic:generic-x86:kgcov
x86_64-rt=generic:generic-x86:rt-generic:rt-generic-x86
-x86_64-rt_debug=generic:generic-x86:debug:debug-x86:rt-generic:rt-generic-x86:rt-debug:rt-debug-x86
+x86_64-rt-debug=generic:generic-x86:debug:debug-x86:rt-generic:rt-generic-x86:rt-debug:rt-debug-x86
# ppc64le
ppc64le=generic:generic-powerpc
@@ -41,5 +41,7 @@ s390x-kgcov=generic:generic-s390x:kgcov
aarch64=generic:generic-arm:generic-arm-aarch64
aarch64-debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm:debug-arm-aarch64
aarch64-kgcov=generic:generic-arm:generic-arm-aarch64:kgcov
+aarch64-64k=generic:generic-arm:generic-arm-aarch64:generic-arm-aarch64-64k
+aarch64-64k-debug=generic:generic-arm:generic-arm-aarch64:generic-arm-aarch64-64k:debug:debug-arm-aarch64:debug-arm-aarch64-64k
aarch64-rt=generic:generic-arm:generic-arm-aarch64:rt-generic:rt-generic-arm:rt-generic-arm-aarch64
-aarch64-rt_debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm:debug-arm-aarch64:rt-generic:rt-generic-arm:rt-generic-arm-aarch64:rt-debug:rt-debug-arm:rt-debug-arm-aarch64
+aarch64-rt-debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm:debug-arm-aarch64:rt-generic:rt-generic-arm:rt-generic-arm-aarch64:rt-debug:rt-debug-arm:rt-debug-arm-aarch64
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -66,6 +66,30 @@
# will not see them.
%global __spec_install_pre %{___build_pre}
+# Replace '-' with '_' where needed so that variants can use '-'
in
+# their name.
+%define uname_suffix %{lua:
+ local flavour = rpm.expand('%{?1:+%{1}}')
+ flavour = flavour:gsub('-', '_')
+ if flavour ~= '' then
+ print(flavour)
+ end
+}
+
+# This returns the main kernel tied to a debug variant. For example,
+# kernel-debug is the debug version of kernel, so we return an empty
+# string. However, kernel-64k-debug is the debug version of kernel-64k,
+# in this case we need to return "64k", and so on. This is used in
+# macros below where we need this for some uname based requires.
+%define uname_variant %{lua:
+ local flavour = rpm.expand('%{?1:%{1}}')
+ _, _, main, sub = flavour:find("(%w+)-(.*)")
+ if main then
+ print("+" .. main)
+ end
+}
+
+
# At the time of this writing (2019-03), RHEL8 packages use w2.xzdio
# compression for rpms (xz, level 2).
# Kernel has several large (hundreds of mbytes) rpms, they take ~5 mins
@@ -186,6 +210,10 @@ Summary: The Linux kernel
%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
%define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1}
+# kernel-64k (aarch64 kernel with 64K page_size)
+%define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
+# kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel)
+%define with_realtime %{?_without_realtime: 1} %{?!_without_realtime: 0}
# kernel-doc
%define with_doc %{?_without_doc: 0} %{?!_without_doc: 1}
# kernel-headers
@@ -256,11 +284,6 @@ Summary: The Linux kernel
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
-# special purpose variants
-
-# RHEL real-time kernel (PREEMPT_RT)
-%define with_realtime %{?_without_realtime: 1} %{?!_without_realtime: 0}
-
%ifarch x86_64
%define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1}
%else
@@ -283,6 +306,7 @@ Summary: The Linux kernel
%define with_selftests 0
# No realtime fedora variants
%define with_realtime 0
+%define with_arm64_64k 0
%endif
%if %{with_verbose}
@@ -485,6 +509,11 @@ Summary: The Linux kernel
%define with_zfcpdump 0
%endif
+# 64k variant only for aarch64
+%ifnarch aarch64
+%define with_arm64_64k 0
+%endif
+
%if 0%{?fedora}
# This is not for Fedora
%define with_zfcpdump 0
@@ -575,6 +604,7 @@ Summary: The Linux kernel
%define with_debug 0
%define with_pae 0
%define with_zfcpdump 0
+%define with_arm64_64k 0
%define with_realtime 0
%define with_debuginfo 0
@@ -878,6 +908,10 @@ Source39: filter-s390x.sh.rhel
Source40: filter-modules.sh.rhel
Source41: x509.genkey.centos
+# ARM64 64K page-size kernel config
+Source42: %{name}-aarch64-64k-rhel.config
+Source43: %{name}-aarch64-64k-debug-rhel.config
+
%endif
%if 0%{?include_fedora}
@@ -942,9 +976,9 @@ Source400: mod-kvm.list
%if %{include_rt}
# realtime config files
Source474: %{name}-aarch64-rt-rhel.config
-Source475: %{name}-aarch64-rt_debug-rhel.config
+Source475: %{name}-aarch64-rt-debug-rhel.config
Source476: %{name}-x86_64-rt-rhel.config
-Source477: %{name}-x86_64-rt_debug-rhel.config
+Source477: %{name}-x86_64-rt-debug-rhel.config
%endif
# Sources for kernel-tools
@@ -988,9 +1022,9 @@ The kernel meta package
%if %{-o:0}%{!-o:1}\
Provides: kernel = %{specversion}-%{pkg_release}\
%endif\
-Provides: kernel-%{_target_cpu} = %{specrpmversion}-%{pkg_release}%{?1:+%{1}}\
-Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel-%{_target_cpu} = %{specrpmversion}-%{pkg_release}%{uname_suffix
%{?1:+%{1}}}\
+Provides: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
Requires(pre): %{kernel_prereq}\
Requires(pre): %{initrd_prereq}\
Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
@@ -1281,8 +1315,8 @@ This is required to use SystemTap with
%{name}%{?1:-%{1}}-%{KVERREL}.\
%package %{?1:%{1}-}devel\
Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{specrpmversion}-%{release}\
-Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
-Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix
%{?1:+%{1}}}\
+Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
Provides: installonlypkg(kernel)\
AutoReqProv: no\
Requires(pre): findutils\
@@ -1295,7 +1329,7 @@ Requires: flex\
Requires: make\
Requires: gcc\
%if %{-m:1}%{!-m:0}\
-Requires: kernel-devel-uname-r = %{KVERREL}\
+Requires: kernel-devel-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
%endif\
%description %{?1:%{1}-}devel\
This package provides kernel headers and makefiles sufficient to build modules\
@@ -1337,13 +1371,13 @@ This package provides *.ipa-clones files.\
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
Group: System Environment/Kernel\
Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} =
%{specrpmversion}-%{release}\
-Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} =
%{specrpmversion}-%{release}%{?1:+%{1}}\
-Provides: kernel%{?1:-%{1}}-modules-internal = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} =
%{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
+Provides: kernel%{?1:-%{1}}-modules-internal = %{specrpmversion}-%{release}%{uname_suffix
%{?1:+%{1}}}\
Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
+Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
AutoReq: no\
AutoProv: yes\
%description %{?1:%{1}-}modules-internal\
@@ -1358,15 +1392,15 @@ This package provides kernel modules for the %{?2:%{2} }kernel
package for Red H
%package %{?1:%{1}-}modules-extra\
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}\
-Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} =
%{specrpmversion}-%{release}%{?1:+%{1}}\
-Provides: kernel%{?1:-%{1}}-modules-extra = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} =
%{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
+Provides: kernel%{?1:-%{1}}-modules-extra = %{specrpmversion}-%{release}%{uname_suffix
%{?1:+%{1}}}\
Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
+Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
%if %{-m:1}%{!-m:0}\
-Requires: kernel-modules-extra-uname-r = %{KVERREL}\
+Requires: kernel-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
%endif\
AutoReq: no\
AutoProv: yes\
@@ -1382,14 +1416,14 @@ This package provides less commonly used kernel modules for the
%{?2:%{2} }kerne
%package %{?1:%{1}-}modules\
Summary: kernel modules to match the %{?2:%{2}-}core kernel\
Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{specrpmversion}-%{release}\
-Provides: kernel-modules-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
-Provides: kernel-modules = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel-modules-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix
%{?1:+%{1}}}\
+Provides: kernel-modules = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
%if %{-m:1}%{!-m:0}\
-Requires: kernel-modules-uname-r = %{KVERREL}\
+Requires: kernel-modules-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
%endif\
AutoReq: no\
AutoProv: yes\
@@ -1405,13 +1439,13 @@ This package provides commonly used kernel modules for the
%{?2:%{2}-}core kerne
%package %{?1:%{1}-}modules-core\
Summary: Core kernel modules to match the %{?2:%{2}-}core kernel\
Provides: kernel%{?1:-%{1}}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}\
-Provides: kernel-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
-Provides: kernel-modules-core = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix
%{?1:+%{1}}}\
+Provides: kernel-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
+Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
%if %{-m:1}%{!-m:0}\
-Requires: kernel-modules-core-uname-r = %{KVERREL}\
+Requires: kernel-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
%endif\
AutoReq: no\
AutoProv: yes\
@@ -1426,10 +1460,10 @@ This package provides essential kernel modules for the
%{?2:%{2}-}core kernel pa
%define kernel_meta_package() \
%package %{1}\
summary: kernel meta-package for the %{1} kernel\
-Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{1}\
-Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{1}\
-Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{1}\
-%if "%{1}" == "rt" || "%{1}" == "rt_debug"\
+Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{uname_suffix %{1}}\
+Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{uname_suffix %{1}}\
+Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{uname_suffix %{1}}\
+%if "%{1}" == "rt" || "%{1}" == "rt-debug"\
Requires: realtime-setup\
%endif\
Provides: installonlypkg(kernel)\
@@ -1463,11 +1497,11 @@ This package provides KVM modules for package kernel%{?1:-%{1}}.\
%define kernel_variant_package(n:mo) \
%package %{?1:%{1}-}core\
Summary: %{variant_summary}\
-Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
Provides: installonlypkg(kernel)\
%if %{-m:1}%{!-m:0}\
-Requires: kernel-core-uname-r = %{KVERREL}\
-Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Requires: kernel-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
+Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant
%{?1:+%{1}}}\
%endif\
%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
%if %{?1:1} %{!?1:0} \
@@ -1485,15 +1519,15 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r =
%{KVERREL}%{?1:+%{1}}\
%endif\
%{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
%endif\
-%if "%{1}" == "rt" || "%{1}" == "rt_debug"\
+%if "%{1}" == "rt" || "%{1}" == "rt-debug"\
%{expand:%%kernel_kvm_package %{?1:%{1}}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
%endif \
%if %{with_efiuki}\
%package %{?1:%{1}-}uki-virt\
Summary: %{variant_summary} unified kernel image for virtual machines\
Provides: installonlypkg(kernel)\
-Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
%endif\
%if %{with_gcov}\
%{expand:%%kernel_gcov_package %{?1:%{1}}}\
@@ -1509,13 +1543,13 @@ Requires: kernel%{?1:-%{1}}-modules-core-uname-r =
%{KVERREL}%{?1:+%{1}}\
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
Group: System Environment/Kernel\
Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} =
%{specrpmversion}-%{release}\
-Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} =
%{specrpmversion}-%{release}%{?1:+%{1}}\
-Provides: kernel%{?1:-%{1}}-modules-partner = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} =
%{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
+Provides: kernel%{?1:-%{1}}-modules-partner = %{specrpmversion}-%{release}%{uname_suffix
%{?1:+%{1}}}\
Provides: installonlypkg(kernel-module)\
-Provides: kernel%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
+Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
AutoReq: no\
AutoProv: yes\
%description %{?1:%{1}-}modules-partner\
@@ -1524,14 +1558,6 @@ This package provides kernel modules for the %{?2:%{2} }kernel
package for Red H
# Now, each variant package.
-%if %{with_realtime}
-%define variant_summary The Linux kernel compiled with PREEMPT_RT
-%kernel_variant_package rt
-%description rt-core
-This package includes a version of the Linux kernel compiled with the
-PREEMPT_RT real-time preemption support
-%endif
-
%if %{with_pae}
%define variant_summary The Linux kernel compiled for Cortex-A15
%kernel_variant_package lpae
@@ -1549,13 +1575,33 @@ zfcpdump infrastructure.
# with_zfcpdump
%endif
+%if %{with_arm64_64k}
+%define variant_summary The Linux kernel compiled for 64k pagesize usage
+%kernel_variant_package 64k
+%description 64k-core
+The kernel package contains a variant of the ARM64 Linux kernel using
+a 64K page size.
+%endif
+
+%if %{with_arm64_64k} && %{with_debug}
%define variant_summary The Linux kernel compiled with extra debugging enabled
%if !%{debugbuildsenabled}
-%kernel_variant_package -m debug
+%kernel_variant_package -m 64k-debug
%else
-%kernel_variant_package debug
+%kernel_variant_package 64k-debug
%endif
-%description debug-core
+%description 64k-debug-core
+The debug kernel package contains a variant of the ARM64 Linux kernel using
+a 64K page size.
+This variant of the kernel has numerous debugging options enabled.
+It should only be installed when trying to gather additional information
+on kernel bugs, as some of these options impact performance noticably.
+%endif
+
+%if %{with_debug} && %{with_realtime}
+%define variant_summary The Linux PREEMPT_RT kernel compiled with extra debugging
enabled
+%kernel_variant_package rt-debug
+%description rt-debug-core
The kernel package contains the Linux kernel (vmlinuz), the core of any
Linux operating system. The kernel handles the basic functions
of the operating system: memory allocation, process allocation, device
@@ -1564,11 +1610,22 @@ input and output, etc.
This variant of the kernel has numerous debugging options enabled.
It should only be installed when trying to gather additional information
on kernel bugs, as some of these options impact performance noticably.
+%endif
-%if %{with_debug} && %{with_realtime}
-%define variant_summary The Linux PREEMPT_RT kernel compiled with extra debugging
enabled
-%kernel_variant_package rt_debug
-%description rt_debug-core
+%if %{with_realtime}
+%define variant_summary The Linux kernel compiled with PREEMPT_RT enabled
+%kernel_variant_package rt
+%description rt-core
+This package includes a version of the Linux kernel compiled with the
+PREEMPT_RT real-time preemption support
+%endif
+
+%if !%{debugbuildsenabled}
+%kernel_variant_package -m debug
+%else
+%kernel_variant_package debug
+%endif
+%description debug-core
The kernel package contains the Linux kernel (vmlinuz), the core of any
Linux operating system. The kernel handles the basic functions
of the operating system: memory allocation, process allocation, device
@@ -1577,7 +1634,6 @@ input and output, etc.
This variant of the kernel has numerous debugging options enabled.
It should only be installed when trying to gather additional information
on kernel bugs, as some of these options impact performance noticably.
-%endif
%if %{with_up}
# And finally the main -core package
@@ -2334,7 +2390,7 @@ BuildKernel() {
# Identify modules in the kernel-modules-partner package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner
%endif
- if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt-debug" ]]; then
# Identify modules in the kernel-rt-kvm package
%{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE400} kvm
fi
@@ -2359,7 +2415,7 @@ BuildKernel() {
# don't include anything going into kernel-modules-partner in the file lists
xargs rm -rf < mod-partner.list
%endif
- if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt-debug" ]]; then
# don't include anything going into kernel-rt-kvm in the file lists
xargs rm -rf < mod-kvm.list
fi
@@ -2456,7 +2512,7 @@ BuildKernel() {
sed -e 's/^lib*/%dir \/lib/' %{?zipsed} $RPM_BUILD_ROOT/module-dirs.list >
../kernel${Variant:+-${Variant}}-modules-core.list
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >>
../kernel${Variant:+-${Variant}}-modules-core.list
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-extra.list >>
../kernel${Variant:+-${Variant}}-modules-extra.list
- if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt-debug" ]]; then
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-kvm.list >>
../kernel${Variant:+-${Variant}}-kvm.list
fi
@@ -2469,7 +2525,7 @@ BuildKernel() {
%if 0%{!?fedora:1}
rm -f $RPM_BUILD_ROOT/mod-partner.list
%endif
- if [[ "$Variant" == "rt" || "$Variant" ==
"rt_debug" ]]; then
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt-debug" ]]; then
rm -f $RPM_BUILD_ROOT/mod-kvm.list
fi
@@ -2553,8 +2609,12 @@ cd linux-%{KVERREL}
%if %{with_debug}
%if %{with_realtime} && !%{with_dbgonly}
-echo "building rt_debug"
-BuildKernel %make_target %kernel_image %{_use_vdso} rt_debug
+echo "building rt-debug"
+BuildKernel %make_target %kernel_image %{_use_vdso} rt-debug
+%endif
+
+%if %{with_arm64_64k}
+BuildKernel %make_target %kernel_image %{_use_vdso} 64k-debug
%endif
%if %{with_up}
@@ -2567,20 +2627,24 @@ BuildKernel %make_target %kernel_image %{_use_vdso} debug
BuildKernel %make_target %kernel_image %{_use_vdso} zfcpdump
%endif
-%if %{with_pae}
-BuildKernel %make_target %kernel_image %{use_vdso} lpae
+%if %{with_arm64_64k}
+BuildKernel %make_target %kernel_image %{_use_vdso} 64k
%endif
-%if %{with_up}
-BuildKernel %make_target %kernel_image %{_use_vdso}
+%if %{with_pae}
+BuildKernel %make_target %kernel_image %{use_vdso} lpae
%endif
%if %{with_realtime}
BuildKernel %make_target %kernel_image %{_use_vdso} rt
%endif
+%if %{with_up}
+BuildKernel %make_target %kernel_image %{_use_vdso}
+%endif
+
%ifnarch noarch i686 %{nobuildarches}
-%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} &&
!%{with_up} && !%{with_realtime}
+%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} &&
!%{with_up} && !%{with_arm64_64k} && !%{with_realtime}
# If only building the user space tools, then initialize the build environment
# and some variables so that the various userspace tools can be built.
InitBuildVars
@@ -2730,11 +2794,14 @@ find Documentation -type d | xargs chmod u+w
fi \
if [ "%{with_debug}" -ne "0" ]; then \
if [ "%{with_realtime}" -ne "0" ]; then \
- %{modsign_cmd} certs/signing_key.pem.sign+rt_debug
certs/signing_key.x509.sign+rt_debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt_debug/ \
+ %{modsign_cmd} certs/signing_key.pem.sign+rt-debug
certs/signing_key.x509.sign+rt-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt-debug/ \
fi \
if [ "%{with_up}" -ne "0" ]; then \
%{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
fi \
+ if [ "%{with_arm64_64k}" -ne "0" ]; then \
+ %{modsign_cmd} certs/signing_key.pem.sign+64k-debug
certs/signing_key.x509.sign+64k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
+ fi \
fi \
if [ "%{with_up}" -ne "0" ]; then \
%{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
@@ -3265,6 +3332,11 @@ fi\
%kernel_variant_post -v lpae -r (kernel|kernel-smp)
%endif
+%if %{with_zfcpdump}
+%kernel_variant_preun zfcpdump
+%kernel_variant_post -v zfcpdump
+%endif
+
%if %{with_debug}
%if %{with_efiuki}
%kernel_uki_virt_scripts debug
@@ -3273,9 +3345,14 @@ fi\
%kernel_variant_post -v debug
%endif
-%if %{with_zfcpdump}
-%kernel_variant_preun zfcpdump
-%kernel_variant_post -v zfcpdump
+%if %{with_arm64_64k}
+%kernel_variant_preun 64k
+%kernel_variant_post -v 64k
+%endif
+
+%if %{with_debug} && %{with_arm64_64k}
+%kernel_variant_preun 64k-debug
+%kernel_variant_post -v 64k-debug
%endif
%if %{with_realtime}
@@ -3283,9 +3360,9 @@ fi\
%kernel_variant_post -v rt -r (kernel|kernel-smp)
%kernel_kvm_post rt
%if %{with_debug}
-%kernel_variant_preun rt_debug
-%kernel_variant_post -v rt_debug
-%kernel_kvm_post rt_debug
+%kernel_variant_preun rt-debug
+%kernel_variant_post -v rt-debug
+%kernel_kvm_post rt-debug
%endif
%endif
@@ -3521,7 +3598,7 @@ fi
%{expand:%%files %{?3:%{3}-}modules-partner}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/partner\
%endif\
-%if "%{3}" == "rt" || "%{3}" == "rt_debug"\
+%if "%{3}" == "rt" || "%{3}" == "rt-debug"\
%{expand:%%files -f %{name}-%{?3:%{3}-}kvm.list %{?3:%{3}-}kvm}\
%endif\
%if %{with_debuginfo}\
@@ -3550,12 +3627,14 @@ fi
%{nil}
%kernel_variant_files %{_use_vdso} %{with_up}
-%if %{with_debug}
-%if %{with_realtime} && !%{with_dbgonly}
-%kernel_variant_files %{_use_vdso} %{with_debug} rt_debug
-%endif
-%if %{with_up}
%kernel_variant_files %{_use_vdso} %{with_debug} debug
+%if %{with_arm64_64k}
+%kernel_variant_files %{_use_vdso} %{with_debug} 64k-debug
+%endif
+%kernel_variant_files %{_use_vdso} %{with_realtime} rt
+%if %{with_realtime}
+%kernel_variant_files %{_use_vdso} %{with_debug} rt-debug
+%endif
%if %{with_debug_meta}
%files debug
%files debug-core
@@ -3564,12 +3643,17 @@ fi
%files debug-modules
%files debug-modules-core
%files debug-modules-extra
+%if %{with_arm64_64k}
+%files 64k-debug
+%files 64k-debug-core
+%files 64k-debug-devel
+%files 64k-debug-devel-matched
+%files 64k-debug-modules
+%files 64k-debug-modules-extra
%endif
%endif
-%endif
-%kernel_variant_files %{use_vdso} %{with_pae} lpae
%kernel_variant_files %{_use_vdso} %{with_zfcpdump} zfcpdump
-%kernel_variant_files %{_use_vdso} %{with_realtime} rt
+%kernel_variant_files %{_use_vdso} %{with_arm64_64k} 64k
%define kernel_variant_ipaclones(k:) \
%if %{1}\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 8/11] redhat: fix realtime and efiuki build
conflict
From: Jan Stancek <jstancek(a)redhat.com>
redhat: fix realtime and efiuki build conflict
We don't want to build a uki image for the realtime kernel, but do
not want to prevent efiuki images from being built when realtime is
also being built. Skip efiuki logic when actively working on a
realtime kernel build.
Signed-off-by: Jan Stancek <jstancek(a)redhat.com>
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1521,7 +1521,7 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r =
%{KVERREL}%{uname_variant %{
%endif\
%if "%{1}" == "rt" || "%{1}" == "rt-debug"\
%{expand:%%kernel_kvm_package %{?1:%{1}}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%endif \
+%else \
%if %{with_efiuki}\
%package %{?1:%{1}-}uki-virt\
Summary: %{variant_summary} unified kernel image for virtual machines\
@@ -1529,6 +1529,7 @@ Provides: installonlypkg(kernel)\
Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
%endif\
+%endif\
%if %{with_gcov}\
%{expand:%%kernel_gcov_package %{?1:%{1}}}\
%endif\
@@ -2448,15 +2449,18 @@ BuildKernel() {
touch lib/modules/$KernelVer/modules.builtin
fi
+ if [[ "$Variant" == "rt" || "$Variant" ==
"rt-debug" ]]; then
+ echo "Skipping efiuki build"
+ else
%if %{with_efiuki}
- popd
+ popd
- KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer"
- KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi"
+ KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer"
+ KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi"
- mkdir -p $KernelUnifiedImageDir
+ mkdir -p $KernelUnifiedImageDir
- dracut --conf=%{SOURCE86} \
+ dracut --conf=%{SOURCE86} \
--confdir=$(mktemp -d) \
--verbose \
--kver "$KernelVer" \
@@ -2469,23 +2473,25 @@ BuildKernel() {
%if %{signkernel}
- %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.tmp -a %{secureboot_ca_0} -c
%{secureboot_key_0} -n %{pesign_name_0}
- %pesign -s -i $KernelUnifiedImage.tmp -o $KernelUnifiedImage.signed -a
%{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1}
- rm -f $KernelUnifiedImage.tmp
+ %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.tmp -a %{secureboot_ca_0} -c
%{secureboot_key_0} -n %{pesign_name_0}
+ %pesign -s -i $KernelUnifiedImage.tmp -o $KernelUnifiedImage.signed -a
%{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1}
+ rm -f $KernelUnifiedImage.tmp
- if [ ! -s $KernelUnifiedImage.signed ]; then
- echo "pesigning failed"
- exit 1
- fi
- mv $KernelUnifiedImage.signed $KernelUnifiedImage
+ if [ ! -s $KernelUnifiedImage.signed ]; then
+ echo "pesigning failed"
+ exit 1
+ fi
+ mv $KernelUnifiedImage.signed $KernelUnifiedImage
# signkernel
%endif
- pushd $RPM_BUILD_ROOT
+ pushd $RPM_BUILD_ROOT
# with_efiuki
%endif
+ : # in case of empty block
+ fi # "$Variant" == "rt" || "$Variant" ==
"rt-debug"
remove_depmod_files
@@ -3598,14 +3604,14 @@ fi
%{expand:%%files %{?3:%{3}-}modules-partner}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/partner\
%endif\
-%if "%{3}" == "rt" || "%{3}" == "rt-debug"\
-%{expand:%%files -f %{name}-%{?3:%{3}-}kvm.list %{?3:%{3}-}kvm}\
-%endif\
%if %{with_debuginfo}\
%ifnarch noarch\
%{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\
%endif\
%endif\
+%if "%{3}" == "rt" || "%{3}" == "rt-debug"\
+%{expand:%%files -f %{name}-%{?3:%{3}-}kvm.list %{?3:%{3}-}kvm}\
+%else\
%if %{with_efiuki}\
%{expand:%%files %{?3:%{3}-}uki-virt}\
%attr(0600, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\
@@ -3615,6 +3621,7 @@ fi
/lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi\
%ghost
/%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:*}-%{KVERREL}%{?3:+%{3}}.efi\
%endif\
+%endif\
%if %{?3:1} %{!?3:0}\
%{expand:%%files %{3}}\
%endif\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 9/11] redhat: update self-test data for addition of
RT and
64k-page variants
From: Clark Williams <williams(a)redhat.com>
redhat: update self-test data for addition of RT and 64k-page variants
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0-0.rc5.6.test.el7
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0-0.rc5.6.test.fc25
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=78e36f3b0dae
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=17
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0-6.test.el7
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=df0cc57e057f
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0-6.test.fc25
SPECKEXTRAVERSION=
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.el7.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=fce15c45d3fb
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.fc25.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 1
%global released_kernel 0
%define buildid .test
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -33,6 +33,7 @@ GNUMAKEFLAGS=
HEAD=2585cf9dfaad
INCLUDE_FEDORA_FILES=1
INCLUDE_RHEL_FILES=1
+INCLUDE_RT_FILES=1
KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2
KABI_CROSS_COMPILE=/usr/bin/aarch64-linux-gnu- /usr/bin/ppc64le-linux-gnu-
/usr/bin/s390x-linux-gnu-
@@ -75,6 +76,7 @@ SPECFILE=kernel.spec
SPECGEMINI=0
SPECINCLUDE_FEDORA_FILES=1
SPECINCLUDE_RHEL_FILES=1
+SPECINCLUDE_RT_FILES=1
SPECKABIVERSION=5.16.0
SPECKEXTRAVERSION=-rc5
SPECKPATCHLEVEL=16
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -2,6 +2,7 @@
%global gemini 0
%global include_fedora 1
%global include_rhel 1
+%global include_rt 1
%global patchlist_changelog 1
%global released_kernel 0
%define buildid .test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 10/11] redhat: don't allow with_rtonly to turn on
unsupported arches
From: Clark Williams <williams(a)redhat.com>
redhat: don't allow with_rtonly to turn on unsupported arches
Move the arch check for with_realtime to below where the
with_rtonly block turns it on.
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -388,11 +388,6 @@ Summary: The Linux kernel
%define with_pae 0
%endif
-# RT kernel is only built on x86_64 and aarch64
-%ifnarch x86_64 aarch64
-%define with_realtime 0
-%endif
-
# if requested, only build base kernel
%if %{with_baseonly}
%define with_pae 0
@@ -451,6 +446,11 @@ Summary: The Linux kernel
%define with_efiuki 0
%endif
+# RT kernel is only built on x86_64 and aarch64
+%ifnarch x86_64 aarch64
+%define with_realtime 0
+%endif
+
# turn off kABI DUP check and DWARF-based check if kABI check is disabled
%if !%{with_kabichk}
%define with_kabidupchk 0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:24 p.m.
New subject: [OS-BUILD PATCHv8 11/11] turn off zfcpdump for rtonly
From: Clark Williams <williams(a)redhat.com>
turn off zfcpdump for rtonly
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -444,6 +444,7 @@ Summary: The Linux kernel
%define with_ipaclones 0
%define with_headers 0
%define with_efiuki 0
+%define with_zfcpdump 0
%endif
# RT kernel is only built on x86_64 and aarch64
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403
3:26 p.m.
New subject: [OS-BUILD PATCHv8 0/11] redhat: Add realtime and arm64
64k-page-size
build and packaging logic
From: Clark Williams on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403#note_1422...
Latest update adds two fixes to turn off zfcpdump kernels if with_rtonly set
and to move the arch check for with_realtime so that invalid arches can be
enabled inadvertently
5:54 p.m.
New subject: [OS-BUILD PATCHv8 0/11] redhat: Add realtime and arm64
64k-page-size
build and packaging logic
From: Clark Williams on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403#note_1422...
During test builds on a experiemental RT branch I realized that with_rtonly
still allowed 64k page size aarch64 kernels; fix that
359
days inactive
359
days old
kernel@lists.fedoraproject.org
13 comments
1 participants
participants (1)
-
Clark Williams (via Email Bridge)