From: Petr Oros <poros(a)redhat.com>
redhat: Set CONFIG_MAXLINEAR_GPHY to =m
This config enables the support for MaxLinear NICs (GPY115/21x/24x driver)
Signed-off-by: Petr Oros <poros(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_MAXLINEAR_GPHY b/redhat/configs/common/generic/CONFIG_MAXLINEAR_GPHY
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_MAXLINEAR_GPHY
+++ b/redhat/configs/common/generic/CONFIG_MAXLINEAR_GPHY
@@ -1 +1 @@
-# CONFIG_MAXLINEAR_GPHY is not set
+CONFIG_MAXLINEAR_GPHY=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1859
Hi,
Here is a little patch series to kick off a discussion on pre-generated
initrd images and unified kernels. Lets start with a description of the
patches:
Patch #1 adds a dracut config file, targeting virtual machines. Given
that most physical machines have either sata or nvme disks these days
it probably boots most physical systems too.
Patch #2 adds a sub-package with an initrd image.
Patch #3 adds a sub-package with an unified kernel.
The goal is to move away from initrd images being generated on the
installed machine. They are generated while building the kernel package
instead. Main motivation for this move is to make the distro more
robust and more secure.
When shipping the initrd as rpm it is possible to check it with the
usual tools ('rpm --verify' for example). TPM measurements are much
more useful because it is possible to pre-calculate the PCR values for a
given kernel version.
When shipping a unified kernel image (containing kernel, initrd, cmdline
and signature) we get the additional benefit that the initrd is covered
by the signature so secure boot will actually be secure.
So, while unified kernels are clearly the better approach it is also the
one which needs some changes in various packages. For an initrd image
the hooks needed are in place thanks to CoreOS shipping initrd images
today. Opt-in by install the sub-rpm and everything JustWorks[tm].
To make unified kernels work smoothly a number of changes are needed
(beside the kernel rpm changes):
(1) Add support for unified kernels to the kernel update scripts.
(/usr/lib/kernel/install.d/*).
(2) Add boot loader support for unified kernel images:
(a) either switch to sd-boot which already supports this.
(b) or add support to grub2 (improve blscfg downstream patch).
(3) Support /boot being vfat (depending on #2, sd-boot needs this).
(4) Remove configuration information (and secrets) from initrd images
and kernel command line.
Most important item here is root the filesystem location, which
should be doable using https://systemd.io/DISCOVERABLE_PARTITIONS/
for many use cases.
Can initially be handled in anaconda kickstart %post scripts.
Long-term we need proper support in anaconda (and any other tool
used to install or generate cloud images), especially if we want
make unified kernel images the default some day.
(5) There might be more ...
I think the best way forward is to skip the initrd image interim step
and try go straight to unified kernel image support, starting with
virtual machines & cloud images, when things are working smoothly there
go expand to cover more use cases. I think it makes sense to start with
the kernel changes.
Comments? Reviews? Suggestions?
thanks & take care,
Gerd
Daniel P. Berrangé (1):
[testing] add a kernel-unified-virt sub-RPM
Gerd Hoffmann (2):
[testing] virtual machine dracut config
[testing] add a kernel-initrd-virt sub-RPM
dracut-virt.conf | 26 +++++++++++++++++++
kernel.spec | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+)
create mode 100644 dracut-virt.conf
--
2.37.2
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1999
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.
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: CPUMASK_KUNIT_TEST [=m]
Type : tristate
Defined at lib/Kconfig.debug:2032
Prompt: KUnit test for cpumask
Depends on: RUNTIME_TESTING_MENU [=y] && KUNIT [=m]
Visible if: RUNTIME_TESTING_MENU [=y] && KUNIT [=m] && !KUNIT_ALL_TESTS
[=m]
Location:
Main menu
-> Kernel hacking
-> Kernel Testing and Coverage
-> Runtime Testing (RUNTIME_TESTING_MENU [=y])
---
Cc: Prarit Bhargava <prarit(a)redhat.com>
Cc: Aristeu Rozanski <arozansk(a)redhat.com>
Cc: Christoph von Recklinghausen <crecklin(a)redhat.com>
Cc: Eugene Syromiatnikov <esyromia(a)redhat.com>
Cc: "Herton R. Krzesinski" <herton(a)redhat.com>
Cc: Nico Pache <npache(a)redhat.com>
Cc: Oleg Nesterov <onestero(a)redhat.com>
Cc: Rafael Aquini <aquini(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/ark/generic/CONFIG_CPUMASK_KUNIT_TEST | 1 +
redhat/configs/pending-ark/generic/CONFIG_CPUMASK_KUNIT_TEST | 15 ------------
redhat/mod-internal.list | 1 +
3 files changed, 2 insertions(+), 15 deletions(-)
From: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
redhat/configs: enable UINPUT on aarch64
Centos-stream 9 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2119170
Upstream Status: RHEL only
Tested: sanity only with make dist-configs
uinput.ko is required for spicevd-agent to work properly.
UINPUT is properly set for all architectures, but its dependency
INPUT_MISC is not.
Remove the override on aarch64 and add a couple of new configs that are
not set to have make dist-configs working. Also disable all of dependent
new input configs that were previously disabled
Results in the old vs new config:
```diff
--- /tmp/kernel-6.0.0-aarch64.config 2022-08-30 09:40:17.529075330 +0200
+++ ./redhat/configs/kernel-6.0.0-aarch64.config 2022-08-30 09:40:47.515018585 +0200
@@ -2988,7 +2988,37 @@
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_IQS269A is not set
+# CONFIG_INPUT_IQS626A is not set
+# CONFIG_INPUT_IQS7222 is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+# CONFIG_INPUT_HISI_POWERKEY is not set
CONFIG_RMI4_CORE=m
CONFIG_RMI4_I2C=m
CONFIG_RMI4_SPI=m
```
Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_INPUT_MISC b/redhat/configs/ark/generic/arm/aarch64/CONFIG_INPUT_MISC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_INPUT_MISC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_MISC is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_ATI_REMOTE2 b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_ATI_REMOTE2
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_ATI_REMOTE2
@@ -0,0 +1 @@
+# CONFIG_INPUT_ATI_REMOTE2 is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_CM109 b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_CM109
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_CM109
@@ -0,0 +1 @@
+# CONFIG_INPUT_CM109 is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_GPIO_ROTARY_ENCODER b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_GPIO_ROTARY_ENCODER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_GPIO_ROTARY_ENCODER
@@ -0,0 +1 @@
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_HISI_POWERKEY
@@ -0,0 +1 @@
+# CONFIG_INPUT_HISI_POWERKEY is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_KEYSPAN_REMOTE b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_KEYSPAN_REMOTE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_KEYSPAN_REMOTE
@@ -0,0 +1 @@
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_POWERMATE b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_POWERMATE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_POWERMATE
@@ -0,0 +1 @@
+# CONFIG_INPUT_POWERMATE is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_REGULATOR_HAPTIC b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_REGULATOR_HAPTIC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_REGULATOR_HAPTIC
@@ -0,0 +1 @@
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_YEALINK b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_YEALINK
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_INPUT_YEALINK
@@ -0,0 +1 @@
+# CONFIG_INPUT_YEALINK is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2002
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile.variables: Add ADD_COMMITID_TO_VERSION
As noted in ARK commit 40aae9752b8b ("Fix versioning on stable Fedora"),
adding the commit ID to all versions must be optional. Currently, the
centos-stream-9 repository does not have this feature and adding it would
cause a significant behavioral change in the dist-*-rpm and other targets.
Add ADD_COMMITID_TO_VERSION which makes adding the commit ID to the
version field optional.
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
@@ -195,7 +195,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
endif
else
SNAPSHOT:=0
- ifneq ("$(DISTRO)", "fedora")
+ ifneq ($(ADD_COMMITID_TO_VERSION),)
_EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null)
ifeq ($(_EXACT_TAG),)
_TAG:=$(shell $(GIT) describe 2>/dev/null)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -124,3 +124,7 @@ RHSELFTESTDATA ?=
# This variable is used by the redhat/self-tests. It should not be
# considered stable and my be changed or removed without warning.
RHDISTDATADIR ?=
+
+# This appends 5 characters of the top-of-tree commit ID to the BUILD variable,
+# which is then reflected in the package NVR.
+ADD_COMMITID_TO_VERSION ?=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2003
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile.variables: Add ADD_COMMITID_TO_VERSION
As noted in ARK commit 40aae9752b8b ("Fix versioning on stable Fedora"),
adding the commit ID to all versions must be optional. Currently, the
centos-stream-9 repository does not have this feature and adding it would
cause a significant behavioral change in the dist-*-rpm and other targets.
Add ADD_COMMITID_TO_VERSION which makes adding the commit ID to the
version field optional.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -124,3 +124,7 @@ RHSELFTESTDATA ?=
# This variable is used by the redhat/self-tests. It should not be
# considered stable and my be changed or removed without warning.
RHDISTDATADIR ?=
+
+# This appends 5 characters of the top-of-tree commit ID to the BUILD variable,
+# which is then reflected in the package NVR.
+ADD_COMMITID_TO_VERSION ?=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2003
From: Ondrej Mosnáček on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1950
Two small spec file tweaks to reduce the disk space footprint of the kernel
build. This is useful for custom/local builds - for example it makes it more
feasible to build the kernel on tmpfs (to reduce HDD/SSD wear and speed up the
build a bit) or on small VM instances.
Please consider merging so I don't have to carry this in a local branch
:slight_smile:
---
redhat/kernel.spec.template | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Always set UPSTREAM
When building the dist-srpm target with VERSION_ON_UPSTREAM=0 the
following error is seen:
fatal: bad revision '^'
This occurs because UPSTREAM is used in genlog.sh but is only set if
VERSION_ON_UPSTREAM=1.
Always set UPSTREAM regardless of the value of VERSION_ON_UPSTREAM.
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
@@ -154,10 +154,12 @@ ifndef VERSION_ON_UPSTREAM
VERSION_ON_UPSTREAM:=0
endif
endif
+
+UPSTREAM:=$(shell $(GIT) rev-parse -q --verify origin/$(UPSTREAM_BRANCH) || \
+ $(GIT) rev-parse -q --verify $(UPSTREAM_BRANCH))
+
ifeq ($(VERSION_ON_UPSTREAM),1)
# UPSTREAM_BRANCH is expected to track mainline.
- UPSTREAM:=$(shell $(GIT) rev-parse -q --verify origin/$(UPSTREAM_BRANCH) || \
- $(GIT) rev-parse -q --verify $(UPSTREAM_BRANCH))
ifeq ($(UPSTREAM),)
$(error "Missing an $(UPSTREAM_BRANCH) branch")
endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2001
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Add cpumask_kunit to mod-internal.list
Another new kunit module that came in with 6.0.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list
index blahblah..blahblah 100644
--- a/redhat/mod-internal.list
+++ b/redhat/mod-internal.list
@@ -61,3 +61,4 @@ test_cpumask
iio-test-format
iio-test-rescale
cros_kunit
+cpumask_kunit
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2000
From: Dan Horák on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1907
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.
https://fedoraproject.org/wiki/Changes/z13BaselineForIBMZ
waiting for FESCo approval
diff for the generated configs
````
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 34499aeae..96dd1f05b 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -3115,7 +3115,7 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_MANAGER_SBS is not set
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z10 is not set
-# CONFIG_MARCH_Z13 is not set
+CONFIG_MARCH_Z13=y
# CONFIG_MARCH_Z14 is not set
# CONFIG_MARCH_Z15 is not set
# CONFIG_MARCH_Z16 is not set
@@ -3123,7 +3123,7 @@ CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z900 is not set
# CONFIG_MARCH_Z9_109 is not set
# CONFIG_MARCH_Z990 is not set
-CONFIG_MARCH_ZEC12=y
+# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
# CONFIG_MARVELL_CN10K_TAD_PMU is not set
````
---
redhat/configs/ark/generic/s390x/CONFIG_MARCH_ZEC12 => redhat/configs/common/generic/s390x/CONFIG_MARCH_ZEC12 | 0
redhat/configs/ark/generic/CONFIG_MARCH_Z16 => redhat/configs/common/generic/CONFIG_MARCH_Z16 | 0
redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z13 | 1 +
redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z16 | 1 -
redhat/configs/fedora/generic/s390x/CONFIG_MARCH_ZEC12 | 1 -
5 files changed, 1 insertions(+), 2 deletions(-)