[OS-BUILD PATCHv2] redhat: spec: trigger dracut when modules are
installed
separately
by Jan Stancek (via Email Bridge)
From: Jan Stancek <jstancek(a)redhat.com>
redhat: spec: trigger dracut when modules are installed separately
In most scenarios, users install -core and -modules subpackages
at the same time (as part of same transaction). But it is also
possible to install -core RPM and then -modules RPM separately.
We allow this because some environments don't need modules.
Installing RPMs separately can cause issues. Since we trigger
initramdisk rebuild (in %posttrans script) only for -core package,
some modules may end up missing.
Introduce state file to determine whether or not -modules subpackage
should trigger dracut to rebuild ramdisk. If both -core and -modules
RPMs are installed in same transaction, there's no extra action.
If -modules RPM is installed separately, trigger dracut
to re-generate init ramdisk.
Signed-off-by: Jan Stancek <jstancek(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
@@ -2684,9 +2684,20 @@ fi\
%define kernel_modules_post() \
%{expand:%%post %{?1:%{1}-}modules}\
/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+if [ ! -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}} ]; then\
+ mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\
+ touch %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\
+fi\
%{nil}\
%{expand:%%postun %{?1:%{1}-}modules}\
/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+%{nil}\
+%{expand:%%posttrans %{?1:%{1}-}modules}\
+if [ -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}} ]; then\
+ rm -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\
+ echo "Running: dracut -f --kver %{KVERREL}%{?1:+%{1}}"\
+ dracut -f --kver "%{KVERREL}%{?1:+%{1}}" || exit $?\
+fi\
%{nil}
# This macro defines a %%posttrans script for a kernel package.
@@ -2701,6 +2712,7 @@ then\
%{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
fi\
%endif\
+rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\
/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
%{nil}
@@ -2721,6 +2733,8 @@ if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\
[ -f /etc/sysconfig/kernel ]; then\
/bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
fi}\
+mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\
+touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\
%{nil}
#
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1644
2Β years, 1Β month
[OS-BUILD PATCHv2 0/24] redhat/Makefile: Cleanup variables
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641
For a long time we have complained about disorganization in the
redhat/Makefile. This was because the code was separated into several
Makefiles (Makefile.cross, Makefile.rhpkg, Makefile.variables,
Makefile.common, and Makefile).
The first part of this changeset drops the dependency on Makefile.common
in redhat/koji/Makefile. The second part of this changeset recombines
redhat/Makefile.common and redhat/Makefile [1]. The remainder of the
patchset are some general cleanups and reorganization of the Makefile
variables.
As a result, the only variables that can be set by users are in
Makefile.variables, and the Makefile now contains a 'fedora', 'centos', and
'other' (aka RHEL) section Makefile variables. The Makefile is now
separated into 3 sections: Deprecated variables, Variables, and
Targets.
This changeset introduces no changes in existing target behavior.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/koji/Makefile | 2 +-
redhat/scripts/create-tarball.sh | 3 +-
redhat/Makefile | 282 ++++++++++++++++++++++++++++++++++----
redhat/Makefile.common | 169 -----------------------
redhat/Makefile.rhpkg | 2 -
redhat/Makefile.variables | 68 +++++++++
redhat/genspec.sh | 12 +-
7 files changed, 326 insertions(+), 212 deletions(-)
2Β years, 1Β month
[OS-BUILD PATCH 0/24] redhat/Makefile: Cleanup variables
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641
For a long time we have complained about disorganization in the
redhat/Makefile. This was because the code was separated into several
Makefiles (Makefile.cross, Makefile.rhpkg, Makefile.variables,
Makefile.common, and Makefile).
The first part of this changeset drops the dependency on Makefile.common
in redhat/koji/Makefile. The second part of this changeset recombines
redhat/Makefile.common and redhat/Makefile [1]. The remainder of the
patchset are some general cleanups and reorganization of the Makefile
variables.
As a result, the only variables that can be set by users are in
Makefile.variables, the Makefile now contains a 'fedora', 'centos', and
'other' (aka RHEL) section, and the scripts called from the Makefile use
Makefile variables. The Makefile is now separated into 3 sections:
Deprecated variables, Variables, and Targets.
This changeset introduces no changes in existing target behavior.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/koji/Makefile | 2 +-
redhat/scripts/create-tarball.sh | 3 +-
redhat/Makefile | 283 ++++++++++++++++++++++++++++++++++----
redhat/Makefile.common | 169 -----------------------
redhat/Makefile.rhpkg | 2 -
redhat/Makefile.variables | 68 +++++++++
redhat/genspec.sh | 12 +-
7 files changed, 327 insertions(+), 212 deletions(-)
2Β years, 1Β month
β
PASS: Test report for kernel 5.16.14-200.fc35 (fedora-35)
by CKI Project
Hello,
We ran automated tests on the following kernel build:
Kernel package: kernel-5.16.14-200.fc35
Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=84029919
The results of these automated tests are provided below.
Overall result: PASSED
Tests: OK
All kernel binaries, config files, and logs are available for download here:
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?pre...
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β‘β‘β‘ SELinux Custom Module Setup
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ xfstests - ext4
β‘β‘β‘ xfstests - xfs
β‘β‘β‘ lvm thinp sanity
β‘β‘β‘ Storage: swraid mdadm raid_module test
π§ β‘β‘β‘ xfstests - btrfs
π§ β‘β‘β‘ Storage blktests - blk
π§ β‘β‘β‘ Storage blktests - nvme-tcp
π§ β‘β‘β‘ Storage block - filesystem fio test
π§ β‘β‘β‘ Storage block - queue scheduler test
π§ β‘β‘β‘ Storage block - storage fio numa
π§ β‘β‘β‘ storage: software RAID testing
π§ β‘β‘β‘ stress: stress-ng - interrupt
π§ β‘β‘β‘ stress: stress-ng - cpu
π§ β‘β‘β‘ stress: stress-ng - cpu-cache
π§ β‘β‘β‘ stress: stress-ng - memory
π§ β‘β‘β‘ stress: stress-ng - os
Host 2:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β
Ethernet drivers sanity - mlx5
Host 3:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
π§ β
Storage blktests - srp
Host 4:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β
ACPI table test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
NFS Connectathon
Host 5:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
π§ β
Storage blktests - nvmeof-mp
Host 6:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β
ACPI table test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
NFS Connectathon
Host 7:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β‘β‘β‘ xfstests - ext4
β‘β‘β‘ xfstests - xfs
β
lvm thinp sanity
β
Storage: swraid mdadm raid_module test
π§ β‘β‘β‘ xfstests - btrfs
π§ β
Storage blktests - blk
π§ β
Storage blktests - nvme-tcp
π§ β
Storage block - filesystem fio test
π§ β‘β‘β‘ Storage block - queue scheduler test
π§ β‘β‘β‘ Storage block - storage fio numa
π§ β‘β‘β‘ storage: software RAID testing
π§ β‘β‘β‘ stress: stress-ng - interrupt
π§ β‘β‘β‘ stress: stress-ng - cpu
π§ β‘β‘β‘ stress: stress-ng - cpu-cache
π§ β‘β‘β‘ stress: stress-ng - memory
π§ β‘β‘β‘ stress: stress-ng - os
ppc64le:
Host 1:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β‘β‘β‘ SELinux Custom Module Setup
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
β‘β‘β‘ xfstests - ext4
β‘β‘β‘ xfstests - xfs
β‘β‘β‘ lvm thinp sanity
β‘β‘β‘ Storage: swraid mdadm raid_module test
π§ β‘β‘β‘ xfstests - btrfs
π§ β‘β‘β‘ Storage blktests - blk
π§ β‘β‘β‘ Storage blktests - nvme-tcp
π§ β‘β‘β‘ Storage block - filesystem fio test
π§ β‘β‘β‘ Storage block - queue scheduler test
π§ β‘β‘β‘ Storage block - storage fio numa
π§ β‘β‘β‘ Storage: lvm device-mapper test - upstream
π§ β‘β‘β‘ storage: software RAID testing
Host 2:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β‘β‘β‘ SELinux Custom Module Setup
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
π§ β‘β‘β‘ Storage blktests - nvmeof-mp
Host 3:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β‘β‘β‘ SELinux Custom Module Setup
β‘β‘β‘ Boot test
β‘β‘β‘ Reboot test
π§ β‘β‘β‘ Storage blktests - srp
Host 4:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
π§ β
NFS Connectathon
Host 5:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
π§ β
NFS Connectathon
Host 6:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
π§ β
Storage blktests - nvmeof-mp
s390x:
Host 1:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
π§ β
Storage blktests - nvmeof-mp
Host 2:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β
Storage: swraid mdadm raid_module test
π§ β Storage blktests - blk
π§ β
Storage blktests - nvme-tcp
π§ β
stress: stress-ng - interrupt
π§ β
stress: stress-ng - cpu
π§ β
stress: stress-ng - cpu-cache
π§ β
stress: stress-ng - memory
π§ β
stress: stress-ng - os
Host 3:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
NFS Connectathon
Host 4:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
NFS Connectathon
Host 5:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
NFS Connectathon
x86_64:
Host 1:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
π§ β
Storage blktests - nvmeof-mp
Host 2:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β
ACPI table test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
π§ β
NFS Connectathon
Host 3:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β‘β‘β‘ xfstests - ext4
β‘β‘β‘ xfstests - xfs
β‘β‘β‘ xfstests - nfsv4.2
β
lvm thinp sanity
β
Storage: swraid mdadm raid_module test
π§ β‘β‘β‘ xfstests - btrfs
π§ β‘β‘β‘ xfstests - cifsv3.11
π§ β
Storage blktests - blk
π§ β
Storage blktests - nvme-tcp
π§ β
Storage block - filesystem fio test
π§ β‘β‘β‘ Storage block - queue scheduler test
π§ β‘β‘β‘ Storage block - storage fio numa
π§ β‘β‘β‘ Storage: lvm device-mapper test - upstream
π§ β‘β‘β‘ storage: software RAID testing
π§ β‘β‘β‘ stress: stress-ng - interrupt
π§ β‘β‘β‘ stress: stress-ng - cpu
π§ β‘β‘β‘ stress: stress-ng - cpu-cache
π§ β‘β‘β‘ stress: stress-ng - memory
π§ β‘β‘β‘ stress: stress-ng - os
Host 4:
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
π§ β
Storage blktests - srp
Host 5:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β
ACPI table test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
π§ β
NFS Connectathon
Host 6:
β‘ Internal infrastructure issues prevented one or more tests (marked
with β‘β‘β‘) from running on this architecture.
This is not the fault of the kernel that was tested.
π§ β
SELinux Custom Module Setup
β
Boot test
β
Reboot test
β
ACPI table test
β‘β‘β‘ LTP - cve
β‘β‘β‘ LTP - sched
β‘β‘β‘ LTP - syscalls
β‘β‘β‘ LTP - can
β‘β‘β‘ LTP - commands
β‘β‘β‘ LTP - containers
β‘β‘β‘ LTP - dio
β‘β‘β‘ LTP - fs
β‘β‘β‘ LTP - fsx
β‘β‘β‘ LTP - math
β‘β‘β‘ LTP - hugetlb
β‘β‘β‘ LTP - mm
β‘β‘β‘ LTP - nptl
β‘β‘β‘ LTP - pty
β‘β‘β‘ LTP - ipc
β‘β‘β‘ LTP - tracing
β‘β‘β‘ LTP: openposix test suite
β
CIFS Connectathon
β
Loopdev Sanity
β
Memory: fork_mem
β
Memory function: memfd_create
β
AMTU (Abstract Machine Test Utility)
β
Ethernet drivers sanity
π§ β
xarray-idr-radixtree-test
π§ β
NFS Connectathon
Test sources: https://gitlab.com/cki-project/kernel-tests
π Pull requests are welcome for new tests or improvements to existing tests!
Aborted tests
-------------
Tests that didn't complete running successfully are marked with β‘β‘β‘.
If this was caused by an infrastructure issue, we try to mark that
explicitly in the report.
Waived tests
------------
If the test run included waived tests, they are marked with π§. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running yet are marked with β±.
2Β years, 1Β month
[OS-BUILD PATCH] redhat: spec: trigger dracut when modules are
installed
separately
by Jan Stancek (via Email Bridge)
From: Jan Stancek <jstancek(a)redhat.com>
redhat: spec: trigger dracut when modules are installed separately
In most scenarios, users install -core and -modules subpackages
at the same time (as part of same transaction). But it is also
possible to install -core RPM and then -modules RPM separately.
We allow this because some environments don't need modules.
Installing RPMs separately can cause issues. Since we trigger
initramdisk rebuild (in %posttrans script) only for -core package,
some modules may end up missing from init ramdisk.
Introduce state file to determine whether or not -modules subpackage
should trigger dracut to rebuild ramdisk. If both -core and -modules
RPMs are installed in same transaction, there's no extra action.
If -modules RPM is installed separately, trigger dracut in %posttrans
to re-generate init ramdisk.
Signed-off-by: Jan Stancek <jstancek(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
@@ -2684,9 +2684,20 @@ fi\
%define kernel_modules_post() \
%{expand:%%post %{?1:%{1}-}modules}\
/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+if [ ! -f %{_localstatedir}/lib/rpm-state/kernel/installing_core ]; then\
+ mkdir -p %{_localstatedir}/lib/rpm-state/kernel\
+ touch %{_localstatedir}/lib/rpm-state/kernel/need_to_run_dracut\
+fi\
%{nil}\
%{expand:%%postun %{?1:%{1}-}modules}\
/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+%{nil}\
+%{expand:%%posttrans %{?1:%{1}-}modules}\
+if [ -f %{_localstatedir}/lib/rpm-state/kernel/need_to_run_dracut ]; then\
+ echo "Running: dracut -f --kver %{KVERREL}%{?1:+%{1}}"\
+ rm -f %{_localstatedir}/lib/rpm-state/kernel/need_to_run_dracut\
+ dracut -f --kver "%{KVERREL}%{?1:+%{1}}" || exit $?\
+fi\
%{nil}
# This macro defines a %%posttrans script for a kernel package.
@@ -2701,6 +2712,7 @@ then\
%{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
fi\
%endif\
+rm -f touch %{_localstatedir}/lib/rpm-state/kernel/installing_core\
/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
%{nil}
@@ -2721,6 +2733,8 @@ if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\
[ -f /etc/sysconfig/kernel ]; then\
/bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
fi}\
+mkdir -p %{_localstatedir}/lib/rpm-state/kernel\
+touch %{_localstatedir}/lib/rpm-state/kernel/installing_core\
%{nil}
#
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1644
2Β years, 1Β month
[OS-BUILD PATCH] redhat/Makefile: Silence dist-clean-configs output
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Silence dist-clean-configs output
Silence dist-clean-configs output.
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
@@ -155,9 +155,7 @@ dist-configs-arch: ARCH_MACH = $(MACH)
dist-configs-arch: dist-configs
dist-clean-configs:
- cd $(REDHAT)/configs; rm -f kernel-*.config \
- kernel-*.config.orig \
- kernel-*.config.tmp
+ @cd $(REDHAT)/configs; rm -f kernel-*.config kernel-*.config.orig kernel-*.config.tmp
dist-clean-sources:
@rm -f $(RPM)/SPECS/*
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1645
2Β years, 1Β month
[OS-BUILD PATCH] redhat/configs: Disable watchdog components
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/configs: Disable watchdog components
These watchdog components are not necessary for RHEL9.
CONFIG_IB700_WDT
CONFIG_ALIM1535_WDT
CONFIG_ALIM7101_WDT
CONFIG_I6300ESB_WDT
CONFIG_IT8712F_WDT
CONFIG_IT87_WDT
CONFIG_MACHZ_WDT
CONFIG_PCIPCWATCHDOG
CONFIG_SMSC_SCH311X_WDT
CONFIG_USBPCWATCHDOG
CONFIG_W83627HF_WDT
CONFIG_W83877F_WDT
CONFIG_W83977F_WDT
CONFIG_WDTPCI
CONFIG_F71808E_WDT
CONFIG_IE6XX_WDT
CONFIG_NV_TCO
CONFIG_SBC_FITPC2_WATCHDOG
CONFIG_SP5100_TCO
CONFIG_VIA_WDT
CONFIG_XEN_WDT
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_ALIM1535_WDT b/redhat/configs/ark/generic/CONFIG_ALIM1535_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_ALIM1535_WDT
@@ -0,0 +1 @@
+# CONFIG_ALIM1535_WDT is not set
diff --git a/redhat/configs/common/generic/s390x/CONFIG_ALIM7101_WDT b/redhat/configs/ark/generic/CONFIG_ALIM7101_WDT
rename from redhat/configs/common/generic/s390x/CONFIG_ALIM7101_WDT
rename to redhat/configs/ark/generic/CONFIG_ALIM7101_WDT
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/s390x/CONFIG_ALIM7101_WDT
+++ b/redhat/configs/ark/generic/CONFIG_ALIM7101_WDT
diff --git a/redhat/configs/ark/generic/CONFIG_F71808E_WDT b/redhat/configs/ark/generic/CONFIG_F71808E_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_F71808E_WDT
@@ -0,0 +1 @@
+# CONFIG_F71808E_WDT is not set
diff --git a/redhat/configs/common/generic/s390x/CONFIG_I6300ESB_WDT b/redhat/configs/ark/generic/CONFIG_I6300ESB_WDT
rename from redhat/configs/common/generic/s390x/CONFIG_I6300ESB_WDT
rename to redhat/configs/ark/generic/CONFIG_I6300ESB_WDT
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/s390x/CONFIG_I6300ESB_WDT
+++ b/redhat/configs/ark/generic/CONFIG_I6300ESB_WDT
diff --git a/redhat/configs/ark/generic/CONFIG_IB700_WDT b/redhat/configs/ark/generic/CONFIG_IB700_WDT
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_IB700_WDT
+++ b/redhat/configs/ark/generic/CONFIG_IB700_WDT
@@ -1 +1 @@
-CONFIG_IB700_WDT=m
+# CONFIG_IB700_WDT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_IT8712F_WDT b/redhat/configs/ark/generic/CONFIG_IT8712F_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_IT8712F_WDT
@@ -0,0 +1 @@
+# CONFIG_IT8712F_WDT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_IT87_WDT b/redhat/configs/ark/generic/CONFIG_IT87_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_IT87_WDT
@@ -0,0 +1 @@
+# CONFIG_IT87_WDT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_MACHZ_WDT b/redhat/configs/ark/generic/CONFIG_MACHZ_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_MACHZ_WDT
@@ -0,0 +1 @@
+# CONFIG_MACHZ_WDT is not set
diff --git a/redhat/configs/common/generic/s390x/CONFIG_PCIPCWATCHDOG b/redhat/configs/ark/generic/CONFIG_PCIPCWATCHDOG
rename from redhat/configs/common/generic/s390x/CONFIG_PCIPCWATCHDOG
rename to redhat/configs/ark/generic/CONFIG_PCIPCWATCHDOG
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/s390x/CONFIG_PCIPCWATCHDOG
+++ b/redhat/configs/ark/generic/CONFIG_PCIPCWATCHDOG
diff --git a/redhat/configs/ark/generic/CONFIG_SMSC_SCH311X_WDT b/redhat/configs/ark/generic/CONFIG_SMSC_SCH311X_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_SMSC_SCH311X_WDT
@@ -0,0 +1 @@
+# CONFIG_SMSC_SCH311X_WDT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_USBPCWATCHDOG b/redhat/configs/ark/generic/CONFIG_USBPCWATCHDOG
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_USBPCWATCHDOG
@@ -0,0 +1 @@
+# CONFIG_USBPCWATCHDOG is not set
diff --git a/redhat/configs/ark/generic/CONFIG_W83627HF_WDT b/redhat/configs/ark/generic/CONFIG_W83627HF_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_W83627HF_WDT
@@ -0,0 +1 @@
+# CONFIG_W83627HF_WDT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_W83877F_WDT b/redhat/configs/ark/generic/CONFIG_W83877F_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_W83877F_WDT
@@ -0,0 +1 @@
+# CONFIG_W83877F_WDT is not set
diff --git a/redhat/configs/ark/generic/CONFIG_W83977F_WDT b/redhat/configs/ark/generic/CONFIG_W83977F_WDT
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/CONFIG_W83977F_WDT
@@ -0,0 +1 @@
+# CONFIG_W83977F_WDT is not set
diff --git a/redhat/configs/common/generic/s390x/CONFIG_WDTPCI b/redhat/configs/ark/generic/CONFIG_WDTPCI
rename from redhat/configs/common/generic/s390x/CONFIG_WDTPCI
rename to redhat/configs/ark/generic/CONFIG_WDTPCI
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/s390x/CONFIG_WDTPCI
+++ b/redhat/configs/ark/generic/CONFIG_WDTPCI
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_F71808E_WDT b/redhat/configs/ark/generic/x86/x86_64/CONFIG_F71808E_WDT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_F71808E_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_F71808E_WDT=m
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_IE6XX_WDT b/redhat/configs/ark/generic/x86/x86_64/CONFIG_IE6XX_WDT
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_IE6XX_WDT
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_IE6XX_WDT
@@ -1 +1 @@
-CONFIG_IE6XX_WDT=m
+# CONFIG_IE6XX_WDT is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_NV_TCO b/redhat/configs/ark/generic/x86/x86_64/CONFIG_NV_TCO
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_NV_TCO
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_NV_TCO
@@ -1 +1 @@
-CONFIG_NV_TCO=m
+# CONFIG_NV_TCO is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_SBC_FITPC2_WATCHDOG b/redhat/configs/ark/generic/x86/x86_64/CONFIG_SBC_FITPC2_WATCHDOG
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_SBC_FITPC2_WATCHDOG
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_SBC_FITPC2_WATCHDOG
@@ -1 +1 @@
-CONFIG_SBC_FITPC2_WATCHDOG=m
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_SP5100_TCO b/redhat/configs/ark/generic/x86/x86_64/CONFIG_SP5100_TCO
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_SP5100_TCO
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_SP5100_TCO
@@ -1 +1 @@
-CONFIG_SP5100_TCO=m
+# CONFIG_SP5100_TCO is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1646
2Β years, 1Β month
[OS-BUILD PATCH] Setting CONFIG_I2C_SMBUS to "m" for ark
by Gopal Tiwari (via Email Bridge)
From: Gopal Tiwari <gtiwari(a)redhat.com>
Setting CONFIG_I2C_SMBUS to "m" for ark
This setting is keeping CONFIG_I2C_SMBUS in align to rhel.
Signed-off-by: Gopal Tiwari <gtiwari(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_I2C_SMBUS b/redhat/configs/common/generic/CONFIG_I2C_SMBUS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_I2C_SMBUS
@@ -0,0 +1 @@
+CONFIG_I2C_SMBUS=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1626
2Β years, 1Β month
[OS-BUILD PATCH 0/2] Fixes for process_configs.sh now that things are
being
processed in parallel.
by Justin M. Forbes (via Email Bridge)
From: Justin M. Forbes on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1643
Now that we are capable of processing multiple config files in parallel, we do
not know exactly which arch a failure is seen on. This is important as
frequently errors are specific to a single arch. This patch just prints the
arch before the variant on failure messages to help us determine the best way
to correct an issue.
While trying to figure out where the failure was, I tried passing make -j1 and
noticed that the call to process_configs.sh in make dist-configs-check did not
pass RHJOBS, so it would always use nproc --all. This is also fixed.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
redhat/configs/process_configs.sh | 6 +++---
redhat/Makefile | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
2Β years, 1Β month
[OS-BUILD PATCH] [redhat] Update scripts to put new configs under
ark-common
by Patrick Talbert (via Email Bridge)
From: Patrick Talbert <ptalbert(a)redhat.com>
[redhat] Update scripts to put new configs under ark-common
The current automated workflow creates new kernel config items in a
pending-common/generic directory and produces an MR which proposes
moving them to common/generic.
These are config settings for ARK so really we should use a pending-ark
directory and propose moving them to the ark/generic directory.
Update the relevant scripts and documentation to take care of this.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/pending-common/debug/arm/aarch64/README b/redhat/configs/pending-ark/debug/arm/aarch64/README
rename from redhat/configs/pending-common/debug/arm/aarch64/README
rename to redhat/configs/pending-ark/debug/arm/aarch64/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/debug/arm/aarch64/README
+++ b/redhat/configs/pending-ark/debug/arm/aarch64/README
diff --git a/redhat/configs/pending-common/debug/powerpc/README b/redhat/configs/pending-ark/debug/powerpc/README
rename from redhat/configs/pending-common/debug/powerpc/README
rename to redhat/configs/pending-ark/debug/powerpc/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/debug/powerpc/README
+++ b/redhat/configs/pending-ark/debug/powerpc/README
diff --git a/redhat/configs/pending-common/debug/s390x/README b/redhat/configs/pending-ark/debug/s390x/README
rename from redhat/configs/pending-common/debug/s390x/README
rename to redhat/configs/pending-ark/debug/s390x/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/debug/s390x/README
+++ b/redhat/configs/pending-ark/debug/s390x/README
diff --git a/redhat/configs/pending-common/debug/x86/x86_64/README b/redhat/configs/pending-ark/debug/x86/x86_64/README
rename from redhat/configs/pending-common/debug/x86/x86_64/README
rename to redhat/configs/pending-ark/debug/x86/x86_64/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/debug/x86/x86_64/README
+++ b/redhat/configs/pending-ark/debug/x86/x86_64/README
diff --git a/redhat/configs/pending-common/generic/arm/aarch64/README b/redhat/configs/pending-ark/generic/arm/aarch64/README
rename from redhat/configs/pending-common/generic/arm/aarch64/README
rename to redhat/configs/pending-ark/generic/arm/aarch64/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/generic/arm/aarch64/README
+++ b/redhat/configs/pending-ark/generic/arm/aarch64/README
diff --git a/redhat/configs/pending-common/generic/powerpc/README b/redhat/configs/pending-ark/generic/powerpc/README
rename from redhat/configs/pending-common/generic/powerpc/README
rename to redhat/configs/pending-ark/generic/powerpc/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/generic/powerpc/README
+++ b/redhat/configs/pending-ark/generic/powerpc/README
diff --git a/redhat/configs/pending-common/generic/s390x/README b/redhat/configs/pending-ark/generic/s390x/README
rename from redhat/configs/pending-common/generic/s390x/README
rename to redhat/configs/pending-ark/generic/s390x/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/generic/s390x/README
+++ b/redhat/configs/pending-ark/generic/s390x/README
diff --git a/redhat/configs/pending-common/generic/x86/x86_64/README b/redhat/configs/pending-ark/generic/x86/x86_64/README
rename from redhat/configs/pending-common/generic/x86/x86_64/README
rename to redhat/configs/pending-ark/generic/x86/x86_64/README
index blahblah..blahblah 100644
--- a/redhat/configs/pending-common/generic/x86/x86_64/README
+++ b/redhat/configs/pending-ark/generic/x86/x86_64/README
diff --git a/redhat/configs/priority.fedora b/redhat/configs/priority.fedora
index blahblah..blahblah 100644
--- a/redhat/configs/priority.fedora
+++ b/redhat/configs/priority.fedora
@@ -16,7 +16,7 @@
# kernel.config files are build on the fly based on this config,
# the first arg is arch and variant, the second is a hierarchy of
# config options, lowest priority to highest
-ORDER=common pending-common fedora pending-fedora custom-overrides
+ORDER=common fedora pending-fedora custom-overrides
EMPTY=s390x-zfcpdump
# x86_64
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
@@ -16,7 +16,7 @@
# kernel.config files are build on the fly based on this config,
# the first arg is arch and variant, the second is a hierarchy of
# config options, lowest priority to highest
-ORDER=common ark pending-common custom-overrides
+ORDER=common ark pending-ark custom-overrides
EMPTY=armv7hl armv7hl-debug armv7hl-lpae armv7hl-lpae-debug i686 i686-debug
# x86_64
diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -348,11 +348,10 @@ FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")"
SCRIPT=$(readlink -f "$0")
SCRIPT_DIR=$(dirname "$SCRIPT")
-# Most RHEL options are options we want in Fedora so RHEL pending settings head
-# to common/
+# Config options for RHEL should target the pending-ark directory, not pending-common.
if [ "$FLAVOR" = "-rhel" ]
then
- FLAVOR="-common"
+ FLAVOR="-ark"
fi
# to handle this script being a symlink
diff --git a/redhat/docs/faq.rst b/redhat/docs/faq.rst
index blahblah..blahblah 100644
--- a/redhat/docs/faq.rst
+++ b/redhat/docs/faq.rst
@@ -22,13 +22,13 @@ bleeding edge.
----------------------------------------------------------
During the -rc1 and -rc2 phase, this is not uncommon. Most configs should
-be autogenerated to defaults and placed in pending-common until an official
+be autogenerated to defaults and placed in pending-ark until an official
review has taken place.
Occassionally during the review cycle, the default changes and new configs
are revealed that are not autogenerated and leads to unresolved configs.
-Creating a file under redhat/configs/pending-common/ with the config
+Creating a file under redhat/configs/pending-ark/ with the config
settings necessary should temporarily resolve this until the maintainers can
resolve this properly.
diff --git a/redhat/docs/repository-layout.rst b/redhat/docs/repository-layout.rst
index blahblah..blahblah 100644
--- a/redhat/docs/repository-layout.rst
+++ b/redhat/docs/repository-layout.rst
@@ -134,8 +134,8 @@ A flavor is defined by:
configuration directories and should include the directory you
defined in step 2.
-common and common-pending
-~~~~~~~~~~~~~~~~~~~~~~~~~
+common and pending-ark
+~~~~~~~~~~~~~~~~~~~~~~
The ``common`` directory contains configuration values that are shared
across all configuration "flavors". For a configuration to be in
@@ -145,19 +145,19 @@ can override settings in ``common``, so it's not guaranteed settings in
common are the same across all flavors. It's simply a good place to set
common values across the flavors and use as a base for new flavors.
-``common-pending`` is where configuration options that have not been
+``pending-ark`` is where configuration options that have not been
reviewed are placed. Automation creates snippets for all new
configuration options exposed during a rebase of ARK in the
-``pending-common`` directory, at which point subsystem maintainers
+``pending-ark`` directory, at which point subsystem maintainers
review the options and set them as appropriate before moving them into
``common``.
-New ARK configurations are placed in ``common-pending`` because it is
+New ARK configurations are placed in ``pending-ark`` because it is
assumed that ARK generally has the most conservative settings, whereas
other flavors like Fedora will be (for the most part) a superset of the
ARK configuration.
-fedora and fedora-pending
+fedora and pending-fedora
~~~~~~~~~~~~~~~~~~~~~~~~~
The ``fedora`` directory contains settings that have been reviewed by
@@ -168,6 +168,6 @@ rebase to expose new configuration options that only apply to Fedora.
For this reason, Fedora has a ``pending-fedora`` directory as well.
``pending-fedora`` contains settings that are not exposed by the
``common`` configuration set and only apply to Fedora. It is, like
-``pending-common``, populated automatically during a rebase. A Fedora
+``pending-ark``, populated automatically during a rebase. A Fedora
kernel maintain can review the settings at their leisure and move them
over to ``fedora`` as they do so.
diff --git a/redhat/gen_config_patches.sh b/redhat/gen_config_patches.sh
index blahblah..blahblah 100755
--- a/redhat/gen_config_patches.sh
+++ b/redhat/gen_config_patches.sh
@@ -107,13 +107,13 @@ for f in "$config_bundles_dir"/*; do
# This loop actually grabs the help text to put in the commit
while read -r line; do
# last line is the actual config we need to put in the dir
- tail -n 1 redhat/configs/pending-common/generic/"$line" > redhat/configs/common/generic/"$line"
+ tail -n 1 redhat/configs/pending-ark/generic/"$line" > redhat/configs/ark/generic/"$line"
# get everything except the last line for the commit text
- head -n -1 redhat/configs/pending-common/generic/"$line" | sed -e 's/^#//g' >> "$tmpdir"/commit
+ head -n -1 redhat/configs/pending-ark/generic/"$line" | sed -e 's/^#//g' >> "$tmpdir"/commit
# add a nice separator that renders in gitlab
echo -ne "\n---\n\n" >> "$tmpdir"/commit
# remove the pending option
- rm redhat/configs/pending-common/generic/"$line"
+ rm redhat/configs/pending-ark/generic/"$line"
done < "$f"
if [ -n "$RHMAINTAINERS" ] && [ -f ./scripts/get_maintainer.pl ] && [ -f "$RHMAINTAINERS" ]; then
echo "" >> "$tmpdir"/commit
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1622
2Β years, 1Β month