From: Herbert Xu on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1304
NOTE: Truncated patchset since committer email 'herbert(a)gondor.apana.org.au'
does not match the submitter's GitLab public email address
'herbert.xu(a)redhat.com'.
Upstream: RHEL only
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1984784
The RHEL FIPS certification effort ran into an show-stopper with
/dev/urandom and getrandom(2) not being FIPS-compliant. At this
point there is no realistic chance of making them FIPS-compliant
upstream. It has also been deemed unrealistic to change user-space
to use the FIPS-compliant RNG through the Crypto API.
Therefore this patch series overrides /dev/*random as well as
getrandom(2) with the Crypto API RNG so that FIPS certification
can proceed.
Signed-off-by: Herbert Xu <herbert.xu(a)redhat.com>
---
crypto/rng.c | 73 ++++++++++++++++++++++++++++++-
drivers/char/random.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/random.h | 7 ++
3 files changed, 194 insertions(+), 1 deletions(-)
From: Don Zickus <dzickus(a)redhat.com>
Add wildcard macros -baseonly -gcov
There are multiple usecases for -baseonly and -gcov on various
targets in the Makefile. Instead of calling those targets out
repeatedly, lets generalize them a bit.
Allow adding -baseonly and -gcov to:
dist-rpm
dist-srpm
dist-brew
dist-koji
distg-brew
distg-koji
Gcov is useful for adding code coverage. Baseonly is useful to only
build the kernel for debugging purposes without userspace tools.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -297,6 +297,12 @@ dist-sources: dist-kabi dist-kabi-dup sources-rh
dist-test-patch: generate-testpatch-tmp
@mv $(TESTPATCH).tmp $(TESTPATCH);
+%-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools --without selftests -bb
+%-baseonly: BUILDOPTS+=-debug -debuginfo -vdso_install -bpftool -perf -tools -selftests
+
+%-gcov: BUILDID=".gcov"
+%-gcov: BUILDOPTS+="+gcov"
+
do-rpmbuild: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" $(RPMBUILDOPTS) $(RPM)/SOURCES/$(PACKAGE_NAME).spec
@@ -306,9 +312,9 @@ dist-all-rpms: dist-sources do-rpmbuild
dist-srpm: RPMBUILDOPTS=--nodeps -bs
dist-srpm: dist-sources do-rpmbuild
-dist-srpm-gcov: BUILDID=".gcov"
-dist-srpm-gcov: BUILDOPTS+="+gcov"
-dist-srpm-gcov: dist-srpm
+dist-srpm-%: dist-srpm
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
dist-rpms: RPMBUILDOPTS=--target $(MACH) -bb
dist-rpms: dist-sources do-rpmbuild
@@ -322,8 +328,7 @@ dist-prep: dist-sources do-rpmbuild
dist-perf: RPMBUILDOPTS=--without up --without smp --without zfcpdump --without debug --without doc --without headers --without --without doc --without debuginfo --target $(MACH) -bb
dist-perf: dist-sources do-rpmbuild
-dist-rpm-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools -bb
-dist-rpm-baseonly: dist-sources do-rpmbuild
+dist-rpm-%: dist-sources do-rpmbuild
# unless you know what you're doing, you don't want to use the next four ones
dist-release-finish: setup-source
@@ -388,9 +393,25 @@ distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
dist-brew dist-koji: dist-%: dist-srpm
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE)
+dist-brew-%: dist-brew
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
+dist-koji-%: dist-koji
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
distg-brew distg-koji: distg-%:
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
+distg-brew-%: dist-brew
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
+distg-koji-%: dist-koji
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
.PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec:
@echo "dist-sources"
@@ -469,34 +490,30 @@ dist-full-help:
@echo 'Building targets:'
@echo ' All RPM/SRPM files will be put under the redhat/rpm/ directory.'
@echo ''
- @echo ' dist-srpm - Create a source RPM and put it into the redhat/rpm/SRPMS/'
+ @echo ' dist-srpm@ - Create a source RPM and put it into the redhat/rpm/SRPMS/'
@echo ' directory. See the dist-brew target for available options.'
- @echo ' dist-srpm-gcov - Create a source RPM with gcov enabled and put it into the'
- @echo ' redhat/rpm/SRPMS/ directory.'
- @echo ' dist-brew - Create a kernel SRPM and then call brew to build the'
+ @echo ' dist-brew@ - Create a kernel SRPM and then call brew to build the'
@echo ' created SRPM. Add BUILDOPTS="+<opt> -<opt> [...]" to'
@echo ' enable/disable build options.'
@echo ' Available <opt>s and their default values:' \
$$(sed -n -e 's/^%define with_\([^ \t]*\).*\?_without_.*/+\1/p' \
-e 's/^%define with_\([^ \t]*\).*\?_with_.*/-\1/p' kernel.spec.template | \
grep -v 'only$$') | fmt -80
- @echo ' dist-koji - Create a kernel SRPM and then call koji to build the'
+ @echo ' dist-koji@ - Create a kernel SRPM and then call koji to build the'
@echo ' created SRPM. See the dist-brew target for available'
@echo ' options.'
- @echo ' distg-brew - Pass HEAD of the current git branch to brew to build an'
+ @echo ' distg-brew@ - Pass HEAD of the current git branch to brew to build an'
@echo ' RPM set. Do not forget to push to the remote repository'
@echo ' first. Preceed make command by RHGITCOMMIT=<commitID>'
@echo ' specify commit ID to use.'
@echo ' To set the remote repo, invoke:'
@echo ' git config rhg.url git://<repo_path>'
- @echo ' distg-koji - Pass HEAD of the current git branch to koji to build an'
+ @echo ' distg-koji@ - Pass HEAD of the current git branch to koji to build an'
@echo ' RPM set. Do not forget to push to the remote repository'
@echo ' first. See the distg-brew target for options and'
@echo ' configuration.'
- @echo ' dist-rpms - Create the binary RPMS for the kernel.'
+ @echo ' dist-rpms@ - Create the binary RPMS for the kernel.'
@echo ' See the dist-brew target for available options.'
- @echo ' dist-rpm-baseonly - Create the binary RPMS for the kernel and modules'
- @echo ' (no userspace tools or debuginfo).'
@echo ' dist-kernel-<type> - Create binary RPMS for a particular kernel type.'
@echo ' Available <type>s:'\
$$(sed -n 's/^%define with_\([^ ]*only\).*/\1/p' kernel.spec.template)
@@ -524,6 +541,12 @@ dist-full-help:
@echo ' dist-rhel-configs - build ELN configs'
@echo ' dist-fedora-configs - build Fedora configs'
+ @echo ''
+ @echo 'Wildcard targets: [indicated by '@' above]'
+ @echo ' *-baseonly - builds only the kernel (disables userspace and debuginfo)'
+ @echo ' - Examples: dist-srpm-baseonly, dist-brew-baseonly'
+ @echo ' *-gcov - builds a kernel with gcov enabled'
+ @echo ' - Examples: dist-srpm-gcov, dist-brew-gcov'
@echo ''
@echo 'kABI targets:'
@echo ' dist-kabi - Create kABI stablelist files in redhat/kabi/kabi-rhel*/'
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1444
From: Sabrina Dubroca on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1619
This MR introduces a new kABI macro, RH_KABI_EXCLUDE_WITH_SIZE. The
implementation is identical to RH_KABI_EXTEND_WITH_SIZE, but the meaning is
more in line with RH_KABI_EXCLUDE. The size check and reserved space allows us
to exclude an element embedded inside a kABI-protected structure while
reserving space for it to grow in the future.
The size checks that are part of multiple kABI macros are currently not
enabled because the config option to turn them on is missing. Those size
checks only make sense on regular builds, so they're disabled on debug
kernels.
Signed-off-by: Sabrina Dubroca <sdubroca(a)redhat.com>
---
include/linux/rh_kabi.h | 26 ++++++++++
redhat/configs/ark/debug/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
redhat/configs/ark/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
redhat/configs/ark/kgcov/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
redhat/configs/common/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
Kconfig.redhat | 9 +++
6 files changed, 39 insertions(+), 0 deletions(-)
From: Mark Langsdorf <mlangsdo(a)redhat.com>
redhat/configs: enable ChromeOS ACPI driver
Provide a device interface for exporting ACPI data on x86 Chromebooks.
Signed-off-by: Mark Langsdorf <mlangsdo(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CHROMEOS_ACPI
@@ -0,0 +1 @@
+CONFIG_CHROMEOS_ACPI=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2153
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Disable frame pointers
Fedora is defaulting to add -fno-omit-frame-pointer by default. This is
not necessary for kernel.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -3,6 +3,9 @@
# environment changes that affect %%install need to go
# here before the %%install macro is pre-built.
+# Disable frame pointers
+%undefine _include_frame_pointers
+
# Disable LTO in userspace packages.
%global _lto_cflags %{nil}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2260
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
The PACKAGE_NAME variable description implies that 'make
PACKAGE_NAME="foo" dist-all-rpms' will create a set of rpms with Name
"foo". This, unfortunately, does not work.
The PACKAGE_NAME variable must be first renamed to SPECPACKAGE_NAME to
comply with the naming convention for Makefile variables that are passed
into the kernel spec file. In addition to that there are several other
cases where 'kernel' is hardcoded in the scripts and spec files. And
lastly, the Makefile assumes that the kernel spec file is always called
"kernel.spec".
Fix these issues, and allow users to set the kernel rpm Name by setting
SPECPACKAGE_NAME.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/configs/build_configs.sh | 8 +-
redhat/configs/generate_all_configs.sh | 11 +-
redhat/configs/process_configs.sh | 4 +-
redhat/docs/kernel-naming.rst | 4 +-
redhat/koji/Makefile | 4 +-
redhat/scripts/genspec/genspec.sh | 1 +
redhat/scripts/expand_srpm.sh | 2 +-
redhat/scripts/rh-dist-git.sh | 14 +-
redhat/Makefile | 34 +-
redhat/Makefile.variables | 10 +-
redhat/kernel-rh.changelog-9.99 | 1771 +++++++++++++++++
redhat/kernel-rh.spec.template | 3238 ++++++++++++++++++++++++++++++++
redhat/kernel.spec.template | 68 +-
13 files changed, 5096 insertions(+), 73 deletions(-)
From: Vitaly Kuznetsov <vkuznets(a)redhat.com>
redhat: Add sub-RPM with a EFI unified kernel image for virtual machines
The new 'kernel-unified-virt' sub-RPM is added on x86_64 targets.
This contains an EFI application that provides a combined vmlinux,
initrd and cmdline, as a so called 'unified kernel image'. The
spec for this is defined by the boot loader specification
https://uapi-group.org/specifications/specs/boot_loader_specification/
The key benefit of a unified kernel is that its secure boot
signature covers the initrd and cmdline contents, allowing
a trustworthy measured boot process with attestation, which
is not practical with locally generated initrds/cmdlines.
Since the initrd is pre-generated its contents have to be
very generic, to be usable on a wide variety of deployments.
To make this problem tractable, the sub-RPM targets only
usage in virtual machines. With such a restriction, the
initrd only needs a very small set of block driver modules
present, in order to be usable across KVM, Hyper-V and Xen
hypervisors which will cover essentially all common public
and private clouds.
Similarly the kernel cmdline cannot contain any host specific
data, which means the root filesystem to mount needs to be
able to be automatically detected. A virtual machine image
intending to use this unified kernel package thus needs to
comply with the discoverable partitions specification:
https://uapi-group.org/specifications/specs/discoverable_partitions_specifi…
Based-on-patch-by: Daniel P. Berrangé <berrange(a)redhat.com>
Based-on-patch-by: Gerd Hoffmann <kraxel(a)redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -639,6 +639,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
../Makefile.rhelver \
README.rst \
kernel-local \
+ dracut-virt.conf \
$(SOURCES)/
@if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \
cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \
diff --git a/redhat/dracut-virt.conf b/redhat/dracut-virt.conf
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/dracut-virt.conf
@@ -0,0 +1,35 @@
+# generic + compressed please
+hostonly="no"
+compress="xz"
+
+# VMs can't update microcode anyway
+early_microcode="no"
+
+# modules: basics
+dracutmodules+=" base systemd systemd-initrd dracut-systemd dbus dbus-broker usrmount shutdown "
+
+# modules: storage support
+dracutmodules+=" dm lvm rootfs-block fs-lib "
+
+# modules: tpm and crypto
+dracutmodules+=" crypt crypt-loop tpm2-tss "
+
+# drivers: virtual buses, pci
+drivers+=" virtio-pci virtio-mmio " # qemu-kvm
+drivers+=" hv-vmbus pci-hyperv " # hyperv
+drivers+=" xen-pcifront " # xen
+
+# drivers: storage
+drivers+=" ahci nvme sd_mod sr_mod " # generic
+drivers+=" virtio-blk virtio-scsi " # qemu-kvm
+drivers+=" hv-storvsc " # hyperv
+drivers+=" xen-blkfront " # xen
+
+# root encryption
+drivers+=" dm_crypt "
+
+# filesystems
+filesystems+=" vfat ext4 xfs overlay "
+
+# systemd-pcrphase
+install_items+=" /lib/systemd/system/systemd-pcrphase-initrd.service /usr/lib/systemd/systemd-pcrphase /usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service "
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -91,6 +91,12 @@ Summary: The Linux kernel
%global zipmodules 1
%endif
+%ifarch x86_64
+%global efiuki 1
+%else
+%global efiuki 0
+%endif
+
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
%endif
@@ -699,6 +705,21 @@ BuildRequires: llvm
BuildRequires: lld
%endif
+%if %{efiuki}
+BuildRequires: dracut
+# For dracut UEFI uki binaries
+BuildRequires: binutils
+# For the initrd
+BuildRequires: lvm2
+%if 0%{?fedora} > 37
+BuildRequires: systemd-boot-unsigned
+%endif
+# For systemd-stub and systemd-pcrphase
+BuildRequires: systemd-udev >= 252-1
+# For TPM operations in UKI initramfs
+BuildRequires: tpm2-tools
+%endif
+
# Because this is the kernel, it's hard to get a single upstream URL
# to represent the base without needing to do a bunch of patching. This
# tarball is generated from a src-git tree. If you want to see the
@@ -826,6 +847,8 @@ Source82: update_scripts.sh
Source84: mod-internal.list
Source85: mod-partner.list
+Source86: dracut-virt.conf
+
Source100: rheldup3.x509
Source101: rhelkpatch1.x509
@@ -1331,6 +1354,13 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
%endif\
%{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
%endif\
+%if %{efiuki}\
+%package %{?1:%{1}-}uki-virt\
+Summary: %{variant_summary} unified kernel image for virtual machines\
+Provides: installonlypkg(kernel)\
+Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{?1:+%{1}}\
+Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+%endif\
%{nil}
#
@@ -1400,6 +1430,14 @@ Linux operating system. The kernel handles the basic functions
of the operating system: memory allocation, process allocation, device
input and output, etc.
+%if %{efiuki}
+%description debug-uki-virt
+Prebuilt debug unified kernel image for virtual machines.
+
+%description uki-virt
+Prebuilt default unified kernel image for virtual machines.
+%endif
+
%if %{with_ipaclones}
%kernel_ipaclones_package
%endif
@@ -2180,6 +2218,45 @@ BuildKernel() {
touch lib/modules/$KernelVer/modules.builtin
fi
+%if %{efiuki}
+ popd
+
+ KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer"
+ KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi"
+
+ mkdir -p $KernelUnifiedImageDir
+
+ dracut --conf=%{SOURCE86} \
+ --confdir=$(mktemp -d) \
+ --verbose \
+ --kver "$KernelVer" \
+ --kmoddir "$RPM_BUILD_ROOT/lib/modules/$KernelVer/" \
+ --logfile=$(mktemp) \
+ --uefi \
+ --kernel-image $(realpath $KernelImage) \
+ --kernel-cmdline 'console=tty0 console=ttyS0' \
+ $KernelUnifiedImage
+
+%if %{signkernel}
+
+ %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
+ %pesign -s -i $KernelUnifiedImage.tmp -o $KernelUnifiedImage.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1}
+ rm -f $KernelUnifiedImage.tmp
+
+ if [ ! -s $KernelUnifiedImage.signed ]; then
+ echo "pesigning failed"
+ exit 1
+ fi
+ mv $KernelUnifiedImage.signed $KernelUnifiedImage
+
+# signkernel
+%endif
+
+ pushd $RPM_BUILD_ROOT
+
+# efiuki
+%endif
+
remove_depmod_files
# Go back and find all of the various directories in the tree. We use this
@@ -2873,12 +2950,14 @@ fi\
# It also defines a %%postun script that does the same thing.
# %%kernel_modules_core_post [<subpackage>]
#
+# FIXME: /bin/kernel-install can't handle UKIs (yet), so cleanup depmod files in %postun for now.
+#
%define kernel_modules_core_post() \
%{expand:%%posttrans %{?1:%{1}-}modules-core}\
/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
%{nil}\
%{expand:%%postun %{?1:%{1}-}modules-core}\
-/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+rm -f /lib/modules/%{KVERREL}%{?1:+%{1}}/modules.*\
%{nil}
# This macro defines a %%posttrans script for a kernel package.
@@ -2926,6 +3005,20 @@ mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\
touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%{-v*}}\
%{nil}
+#
+# This macro defines scripts for a kernel*-uki-virt package
+#
+# FIXME: /bin/kernel-install can't handle UKIs (yet), so just cp/rm as temporary stop-gap
+#
+%define kernel_uki_virt_scripts() \
+%{expand:%%posttrans %{?1:%{1}-}uki-virt}\
+mkdir -p /boot/efi/EFI/Linux\
+cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\
+%{nil}\
+%{expand:%%postun %{?1:%{1}-}uki-virt}\
+rm -f /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\
+%{nil}
+
#
# This macro defines a %%preun script for a kernel package.
# %%kernel_variant_preun <subpackage>
@@ -2939,6 +3032,10 @@ then\
fi\
%{nil}
+%if %{efiuki}
+%kernel_uki_virt_scripts
+%endif
+
%kernel_variant_preun
%kernel_variant_post -r kernel-smp
@@ -2948,6 +3045,9 @@ fi\
%endif
%if %{with_debug}
+%if %{efiuki}
+%kernel_uki_virt_scripts debug
+%endif
%kernel_variant_preun debug
%kernel_variant_post -v debug
%endif
@@ -3188,6 +3288,11 @@ fi
%{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\
%endif\
%endif\
+%if %{efiuki}\
+%{expand:%%files %{?3:%{3}-}uki-virt}\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi\
+%ghost /%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}-virt.efi\
+%endif\
%if %{?3:1} %{!?3:0}\
%{expand:%%files %{3}}\
%endif\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2175
From: Zbigniew Jędrzejewski-Szmek on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1617
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
---
redhat/kernel.spec.template | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2173
Most of the kernel and its packing is currently xz. There are two
exceptions: the aarch64 boot an initrd images [1] and KABI. Mark gzip as
only being necessary for aarch64, and change the KABI symbol compression
to xz.
There are other compression algorithms that are becoming more popular. To
prepare for this change, add a compression variable and compression file
extension variable.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
[1] There is upstream work on implementing xz and other compression
algorithms for aarch64. This work should be completed in the next few
upstream kernel and bootloader releases.
---
redhat/kernel.spec.template | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
From: Scott Weaver <scweaver(a)redhat.com>
kernel.spec: add llvm-devel build requirement
The bpftool and the llvm system feature check requires the llvm-devel
package. The bpftool package is only created if selftests is defined and
when selftests is enabled, then samples/bpf will be built which will use
the llvm feature check. Therefore the llvm-devel package is added as a
build requirement of selftests to keep it consistent with the llvm
package already specified there.
A dependency of the llvm-devel package is llvm so we no longer need to
specify this package explicitly.
This change came in eb9d1acf634ba ('bpftool: Add LLVM as default
library for disassembling JIT-ed programs').
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -635,7 +635,7 @@ BuildRequires: python3-docutils
BuildRequires: zlib-devel binutils-devel
%endif
%if %{with_selftests}
-BuildRequires: clang llvm fuse-devel
+BuildRequires: clang llvm-devel fuse-devel
%ifnarch %{arm}
BuildRequires: numactl-devel
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2264
From: Clark Williams on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2262
Change merge.py to handle input config files in similar manner to
how merge.pl did it.
Signed-off-by: Clark Williams <williams(a)redhat.com>
---
redhat/configs/merge.pl | 72 ----------------------------
redhat/configs/merge.py | 110 +++++++++++++++++++++++++++----------------
redhat/Makefile | 2 +-
redhat/kernel.spec.template | 10 ++--
4 files changed, 74 insertions(+), 120 deletions(-)
From: Scott Weaver <scweaver(a)redhat.com>
kernel.spec: add llvm-devel build requirement
The bpftool and the llvm system feature check requires the llvm-devel
package. The bpftool package is only created if selftests is defined and
when selftests is enabled, then samples/bpf will be built which will use
the llvm feature check. Therefore the llvm-devel package is added as a
build requirement of selftests to keep it consistent with the llvm
package already specified there.
This change came in eb9d1acf634ba ('bpftool: Add LLVM as default
library for disassembling JIT-ed programs').
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -635,7 +635,7 @@ BuildRequires: python3-docutils
BuildRequires: zlib-devel binutils-devel
%endif
%if %{with_selftests}
-BuildRequires: clang llvm fuse-devel
+BuildRequires: clang llvm llvm-devel fuse-devel
%ifnarch %{arm}
BuildRequires: numactl-devel
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2264
From: Clark Williams on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2262
Change merge.py to handle input config files in similar manner to
how merge.pl did it.
Signed-off-by: Clark Williams <williams(a)redhat.com>
---
redhat/configs/merge.pl | 72 -----------------------------
redhat/configs/merge.py | 109 +++++++++++++++++++++++++++----------------
redhat/Makefile | 2 +-
redhat/kernel.spec.template | 10 ++--
4 files changed, 73 insertions(+), 120 deletions(-)
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Fix up SQUASHFS decompression configs
The 6.2 merge window changed the way that squashfs decompression
threading worked. It now allows the number of threads to be set as mount
options if all options are compiled. Until a decicion is made on this
functionality, this MR factors in the new options and gives us a built
kernel config similar to what has been supported in previous releases.
We select CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU as the only option. If a
different config is desired, I am happy to change this, but our current
defaults were not working as it forced a config mismatch, and I did not
want the state to get lost.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT b/redhat/configs/ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT
@@ -0,0 +1 @@
+# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI
@@ -0,0 +1 @@
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU
@@ -0,0 +1 @@
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
diff --git a/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE
@@ -0,0 +1 @@
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT
+++ /dev/null
@@ -1,15 +0,0 @@
-# Symbol: SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n]
-# Type : bool
-# Defined at fs/squashfs/Kconfig:69
-# Prompt: Select the parallel decompression mode during mount
-# Depends on: MISC_FILESYSTEMS [=y] && SQUASHFS [=m]
-# Location:
-# -> File systems
-# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y])
-# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m])
-# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n])
-# Selects: SQUASHFS_DECOMP_SINGLE [=y] && SQUASHFS_DECOMP_MULTI [=n] && SQUASHFS_DECOMP_MULTI_PERCPU [=n] && SQUASHFS_MOUNT_DECOMP_THREADS [=n]
-#
-#
-#
-# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI
+++ /dev/null
@@ -1,17 +0,0 @@
-# Symbol: SQUASHFS_COMPILE_DECOMP_MULTI [=n]
-# Type : bool
-# Defined at fs/squashfs/Kconfig:101
-# Prompt: Use multiple decompressors for parallel I/O
-# Depends on: <choice>
-# Location:
-# -> File systems
-# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y])
-# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m])
-# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n])
-# -> Select decompression parallel mode at compile time (<choice> [=y])
-# -> Use multiple decompressors for parallel I/O (SQUASHFS_COMPILE_DECOMP_MULTI [=n])
-# Selects: SQUASHFS_DECOMP_MULTI [=n]
-#
-#
-#
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU
+++ /dev/null
@@ -1,17 +0,0 @@
-# Symbol: SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU [=n]
-# Type : bool
-# Defined at fs/squashfs/Kconfig:116
-# Prompt: Use percpu multiple decompressors for parallel I/O
-# Depends on: <choice>
-# Location:
-# -> File systems
-# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y])
-# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m])
-# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n])
-# -> Select decompression parallel mode at compile time (<choice> [=y])
-# -> Use percpu multiple decompressors for parallel I/O (SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU [=n])
-# Selects: SQUASHFS_DECOMP_MULTI_PERCPU [=n]
-#
-#
-#
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE
+++ /dev/null
@@ -1,17 +0,0 @@
-# Symbol: SQUASHFS_COMPILE_DECOMP_SINGLE [=y]
-# Type : bool
-# Defined at fs/squashfs/Kconfig:93
-# Prompt: Single threaded compression
-# Depends on: <choice>
-# Location:
-# -> File systems
-# -> Miscellaneous filesystems (MISC_FILESYSTEMS [=y])
-# -> SquashFS 4.0 - Squashed file system support (SQUASHFS [=m])
-# -> Select the parallel decompression mode during mount (SQUASHFS_CHOICE_DECOMP_BY_MOUNT [=n])
-# -> Select decompression parallel mode at compile time (<choice> [=y])
-# -> Single threaded compression (SQUASHFS_COMPILE_DECOMP_SINGLE [=y])
-# Selects: SQUASHFS_DECOMP_SINGLE [=y]
-#
-#
-#
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
diff --git a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_DECOMP_SINGLE b/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_DECOMP_SINGLE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-ark/generic/CONFIG_SQUASHFS_DECOMP_SINGLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2277
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253
The PACKAGE_NAME variable description implies that 'make
PACKAGE_NAME="foo" dist-all-rpms' will create a set of rpms with Name
"foo". This, unfortunately, does not work.
The PACKAGE_NAME variable must be first renamed to SPEC_PACKAGENAME to
comply with the naming convention for Makefile variables that are passed
into the kernel spec file. In addition to that there are several other
cases where 'kernel' is hardcoded in the scripts and spec files. And
lastly, the Makefile assumes that the kernel spec file is always called
"kernel.spec".
Fix these issues, and allow users to set the kernel rpm Name by setting
SPECPACKAGE_NAME.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/configs/build_configs.sh | 8 +-
redhat/configs/generate_all_configs.sh | 11 +-
redhat/configs/process_configs.sh | 4 +-
redhat/docs/kernel-naming.rst | 4 +-
redhat/koji/Makefile | 4 +-
redhat/scripts/genspec/genspec.sh | 1 +
redhat/scripts/expand_srpm.sh | 2 +-
redhat/scripts/rh-dist-git.sh | 14 +-
redhat/Makefile | 34 +-
redhat/Makefile.variables | 2 +-
redhat/kernel-rh.changelog-9.99 | 1771 +++++++++++++++++
redhat/kernel-rh.spec.template | 3238 ++++++++++++++++++++++++++++++++
redhat/kernel.spec.template | 68 +-
13 files changed, 5092 insertions(+), 69 deletions(-)
From: Michal Schmidt <mschmidt(a)redhat.com>
redhat/configs: enable CONFIG_OCTEON_EP as a module in ARK
This enables the building of the octeon_ep driver in ARK.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2041990
Signed-off-by: Michal Schmidt <mschmidt(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_OCTEON_EP b/redhat/configs/ark/generic/CONFIG_OCTEON_EP
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_OCTEON_EP
+++ b/redhat/configs/ark/generic/CONFIG_OCTEON_EP
@@ -1 +1 @@
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2276
TWIMC: My Linux kernel vanilla repositories for Fedora after ten years
moved to a new location and live in copr now:
https://copr.fedorainfracloud.org/groups/g/kernel-vanilla/coprs/
The move brings a few improvements. The repositories will follow
upstream more closely: in the ideal case new versions will be available
within roundabout three hours of their release. And in addition to the
mainline, mainline-wo-mergew, stable, and fedora repositories there are
two more repositories now: stable-rc and next. For details about all of
them and which kernels they offer, see:
https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories
Everyone using the old repos on repos.fedorapeople.org/repos/thl/,
please remove the yum repo file for them and enable the equivalent copr
repo instead. I'll keep the repos in the old location alive for another
week, but then will dismantle them. Sorry, I know that creates trouble
for users; but well, the repos had a pretty good run I’d say, as it
seems I have been maintaining them in that place for nearly exactly ten
years! Time flies…
TWIMC, more timely updates and the two new repositories were made
possible by switching my workflow to the infrastructure from kernel-ark
(https://gitlab.com/cki-project/kernel-ark )[1]. That among others
allows me to automatically update the packages to the latest codebase
and kick off a rebuild (in the past I was modifying Fedora's dist.git
kernel, which often required some manual work). The spec file used to
build the kernel vanilla packages nevertheless remains nearly identical
to the one used to build Fedora's kernel, as its maintainers maintain
those packages using kernel-ark, too.
Ciao, Thorsten
[1] a few changes were needed for my use case, some of which might be
interesting for upstream:
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2275
From: Justin M. Forbes on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2263
For many years, rawhide kernels have forced users to run debug builds on
git snapshots by not building a non debug kernel as an option. While
this has served us well, in finding occasional bugs that are less likely
to surface otherwise, the performance of debug kernels has gotten
considerably worse over time. After evaluating the debug configs to see
if performance could be improved, it has become clear that we would have
to trade off too much to regain performance. We would be better served
by leaving more debug options enabled and offering a non debug kernel
for all users on all builds.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
redhat/scripts/genspec/genspec.sh | 10 ----------
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 1 -
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 1 -
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 1 -
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 1 -
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 1 -
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 1 -
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 1 -
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 1 -
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 1 -
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 1 -
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 1 -
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 1 -
redhat/kernel.spec.template | 6 +++---
14 files changed, 3 insertions(+), 25 deletions(-)
From: Phil Sutter <psutter(a)redhat.com>
Revert "redhat: configs: Disable xtables and ipset"
This reverts commit ebafea5303ae22b582590917be79c10f073d76fe.
It seems kernel-ark config is used for libvirt testing with upstream
kernels. Libvirt still requires iptables, though. So revert this for
now.
Contrary to reverted commit ebafea5303ae2, it is not sufficient to
remove the disabling config snippets as the respective enabling ones
have been moved from 'common' space to 'fedora'. Move them back.
Signed-off-by: Phil Sutter <psutter(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER b/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_BRIDGE_NETFILTER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BRIDGE_NETFILTER is not set
diff --git a/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES b/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_BRIDGE_NF_EBTABLES
+++ /dev/null
@@ -1,2 +0,0 @@
-# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance.
-# CONFIG_BRIDGE_NF_EBTABLES is not set
diff --git a/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES b/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_IP6_NF_IPTABLES
+++ /dev/null
@@ -1,2 +0,0 @@
-# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance.
-# CONFIG_IP6_NF_IPTABLES is not set
diff --git a/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES b/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_IP_NF_ARPTABLES
+++ /dev/null
@@ -1,2 +0,0 @@
-# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance.
-# CONFIG_IP_NF_ARPTABLES is not set
diff --git a/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES b/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_IP_NF_IPTABLES
+++ /dev/null
@@ -1,2 +0,0 @@
-# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance.
-# CONFIG_IP_NF_IPTABLES is not set
diff --git a/redhat/configs/ark/generic/CONFIG_IP_SET b/redhat/configs/ark/generic/CONFIG_IP_SET
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_IP_SET
+++ /dev/null
@@ -1,2 +0,0 @@
-# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance.
-# CONFIG_IP_SET is not set
diff --git a/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES b/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_NETFILTER_XTABLES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NETFILTER_XTABLES is not set
diff --git a/redhat/configs/ark/generic/CONFIG_NFT_COMPAT b/redhat/configs/ark/generic/CONFIG_NFT_COMPAT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_NFT_COMPAT
+++ /dev/null
@@ -1,2 +0,0 @@
-# This CONFIG has been disabled in RHEL by RHEL Engineering. Please contact Red Hat Support for further assistance.
-# CONFIG_NFT_COMPAT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS b/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_NF_CONNTRACK_LABELS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NF_CONNTRACK_LABELS=y
diff --git a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER b/redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER
rename from redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER
rename to redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NETFILTER
+++ b/redhat/configs/common/generic/CONFIG_BRIDGE_NETFILTER
diff --git a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES b/redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES
rename from redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES
rename to redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_BRIDGE_NF_EBTABLES
+++ b/redhat/configs/common/generic/CONFIG_BRIDGE_NF_EBTABLES
diff --git a/redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES b/redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES
rename from redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES
rename to redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_IP6_NF_IPTABLES
+++ b/redhat/configs/common/generic/CONFIG_IP6_NF_IPTABLES
diff --git a/redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES b/redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES
rename from redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES
rename to redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_IP_NF_ARPTABLES
+++ b/redhat/configs/common/generic/CONFIG_IP_NF_ARPTABLES
diff --git a/redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES b/redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES
rename from redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES
rename to redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_IP_NF_IPTABLES
+++ b/redhat/configs/common/generic/CONFIG_IP_NF_IPTABLES
diff --git a/redhat/configs/fedora/generic/CONFIG_IP_SET b/redhat/configs/common/generic/CONFIG_IP_SET
rename from redhat/configs/fedora/generic/CONFIG_IP_SET
rename to redhat/configs/common/generic/CONFIG_IP_SET
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_IP_SET
+++ b/redhat/configs/common/generic/CONFIG_IP_SET
diff --git a/redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES b/redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES
rename from redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES
rename to redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_NETFILTER_XTABLES
+++ b/redhat/configs/common/generic/CONFIG_NETFILTER_XTABLES
diff --git a/redhat/configs/fedora/generic/CONFIG_NFT_COMPAT b/redhat/configs/common/generic/CONFIG_NFT_COMPAT
rename from redhat/configs/fedora/generic/CONFIG_NFT_COMPAT
rename to redhat/configs/common/generic/CONFIG_NFT_COMPAT
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_NFT_COMPAT
+++ b/redhat/configs/common/generic/CONFIG_NFT_COMPAT
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2267
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Remove GIT deprecated message
Remove the GIT variable deprecated message.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -5,12 +5,6 @@ include Makefile.variables
#
# This section is intentionally left at the top of the Makefile so it won't be ignored.
#
-# This deprecation message must come after GIT is set in Makefile.variables.
-
-ifneq ($(GIT),git)
- # deprecated in 5.20.0
- $(warning WARNING: GIT($(GIT)) will be deprecated in a later release.)
-endif
# These entries are 'duplicates' of variables specified in Makefile.variables
# that are used in the SPEC file. Specifying these with a SPEC prefix indicates
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2272
From: Justin M. Forbes on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2263
For many years, rawhide kernels have forced users to run debug builds on
git snapshots by not building a non debug kernel as an option. While
this has served us well, in finding occasional bugs that are less likely
to surface otherwise, the performance of debug kernels has gotten
considerably worse over time. After evaluating the debug configs to see
if performance could be improved, it has become clear that we would have
to trade off too much to regain performance. We would be better served
by leaving more debug options enabled and offering a non debug kernel
for all users on all builds.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
redhat/scripts/genspec/genspec.sh | 9 ---------
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 1 -
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 1 -
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 1 -
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 1 -
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 1 -
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 1 -
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 1 -
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 1 -
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 1 -
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 1 -
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 1 -
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 1 -
redhat/kernel.spec.template | 6 +++---
14 files changed, 3 insertions(+), 24 deletions(-)
From: Justin M. Forbes on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2263
For many years, rawhide kernels have forced users to run debug builds on
git snapshots by not building a non debug kernel as an option. While
this has served us well, in finding occasional bugs that are less likely
to surface otherwise, the performance of debug kernels has gotten
considerably worse over time. After evaluating the debug configs to see
if performance could be improved, it has become clear that we would have
to trade off too much to regain performance. We would be better served
by leaving more debug options enabled and offering a non debug kernel
for all users on all builds.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
redhat/scripts/genspec/genspec.sh | 9 ---------
redhat/kernel.spec.template | 6 +++---
2 files changed, 3 insertions(+), 12 deletions(-)