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(-)