From: Scott Weaver <scweaver(a)redhat.com>
[redhat] ark-create-release.sh: use 3-way merge
There can be conflicts that the 3-way merge strategy can resolve
when adding the Include in Releases MRs. Let 'git am' fall back to
use the 3-way merge strategy if the patch does not initially apply.
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-create-release.sh
+++ b/redhat/scripts/ci/ark-create-release.sh
@@ -23,7 +23,7 @@ MR_PATCHES=$(gitlab project-merge-request list --project-id="$PROJECT_ID" \
--labels="Include in Releases" --state=opened | grep -v "^$" | sort | \
awk '{ print "https://gitlab.com/cki-project/kernel-ark/-/merge_requests/" $2 ".patch" }')
for patch_url in $MR_PATCHES; do
- curl -sL "$patch_url" | git am
+ curl -sL "$patch_url" | git am -3
done
# if dist-release doesn't update anything, then there is a good chance the
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3016
From: Luiz Capitulino <luizcap(a)redhat.com>
redhat/configs: Enable & consolidate BF-3 drivers config
We're enabling Bluefield-3 for RHEL, therefore this commit enables BF-3 drivers
for both RHEL and Fedora.
Before this commit:
o Drivers enabled only in Fedora: gpio-mlxbf3, pinctrl-mlxbf3, pwr-mlxbf,
sdhci-of-dwcmshc
o Drivers disabled in both: mlxbf-pmc
After this commit:
o All drivers are enabled for RHEL and Fedora on ARM64-only
A few notes:
o With the exception of sdhci-of-dwcmshc all drivers are ARM64-only.
Since this is the only known usage of sdhci-of-dwcmshc, keep it
enabled only for ARM64
o Build tested with tag kernel-6.8.0-63 since current os-build
(2f0232a693b35b) is not building for me
Signed-off-by: Luiz Capitulino <luizcap(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_MLXBF_PMC b/redhat/configs/common/generic/CONFIG_MLXBF_PMC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_MLXBF_PMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MLXBF_PMC is not set
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MLXBF3 b/redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_MLXBF3
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MLXBF3
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_MLXBF3
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MLXBF3
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_MLXBF3
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_MLXBF_PMC b/redhat/configs/common/generic/arm/aarch64/CONFIG_MLXBF_PMC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_MLXBF_PMC
@@ -0,0 +1 @@
+CONFIG_MLXBF_PMC=m
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_MMC_SDHCI_OF_DWCMSHC b/redhat/configs/common/generic/arm/aarch64/CONFIG_MMC_SDHCI_OF_DWCMSHC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_MMC_SDHCI_OF_DWCMSHC
@@ -0,0 +1 @@
+CONFIG_MMC_SDHCI_OF_DWCMSHC=m
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MLXBF3 b/redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_MLXBF3
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MLXBF3
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_MLXBF3
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MLXBF3
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_PINCTRL_MLXBF3
diff --git a/redhat/configs/fedora/generic/CONFIG_POWER_MLXBF b/redhat/configs/common/generic/arm/aarch64/CONFIG_POWER_MLXBF
rename from redhat/configs/fedora/generic/CONFIG_POWER_MLXBF
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_POWER_MLXBF
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_POWER_MLXBF
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_POWER_MLXBF
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_MLXBF_PMC b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_MLXBF_PMC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_MLXBF_PMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MLXBF_PMC is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_GPIO_MLXBF3 b/redhat/configs/rhel/generic/CONFIG_GPIO_MLXBF3
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_GPIO_MLXBF3
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_MLXBF3 is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_PINCTRL_MLXBF3 b/redhat/configs/rhel/generic/CONFIG_PINCTRL_MLXBF3
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_PINCTRL_MLXBF3
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_MLXBF3 is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_POWER_MLXBF b/redhat/configs/rhel/generic/CONFIG_POWER_MLXBF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_POWER_MLXBF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_POWER_MLXBF is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2991
From: Thorsten Leemhuis on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2975
NOTE: Truncated patchset since committer email 'fedora(a)leemhuis.info'
does not match the submitter's GitLab public email address
'linux(a)leemhuis.info'.
In the past few weeks while building linux-next for my kernel vanilla
repositories I noticed a few upstream changes that require changes to files
like mod-internal.list or filter-modules.sh.fedora for kernel-ark builds to
succeed. Changes like these will most likely be needed in kernel-ark/os-build
soon, as the those upstream changes are heading towards mainline currently.
I'm providing these changes here in advance in case they might helpful for
@jmflinuxtx or somebody else (either for cherry-picking for for merging as a
whole).
---
redhat/scripts/mod/mod-internal.list | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2972
More cleanup fixes to handle daily merges for rt-devel and automotive-devel.
Tested by simulating the two daily cronjob in test-os-builds.
Signed-off-by: Don Zickus dzickus(a)redhat.com
---
redhat/scripts/ci/ark-ci-env.sh | 13 +++++--------
redhat/scripts/ci/ark-merge-rt.sh | 9 +++++----
.gitlab-ci.yml | 4 ++++
3 files changed, 14 insertions(+), 12 deletions(-)
From: Emanuele Giuseppe Esposito on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2917
We want to enable kernel.spec to optionally ship UKI addons defined in a
common config file in redhat folder.
The folder redhat/addons will contain all addons configs specifying the
UKI kernel cmdline addons to be created in the next build. An addon
config is simply a .addon plain text file, where any line
is taken as kernel cmdline, except for the ones starting with '#',
which will be automatically ignored.
redhat/scripts/uki_addons.py will take care of parsing all configs and
folders in redhat/addons and call 'ukify' to create the actual addons.
The output addon filename will be a concatenation of all folders in
redhat/addons that are part of the addon config path.
For example, an addon config redhat/addons/1/2/3/test.addon will result
in generating redhat/addons_output/1-2-3-test.addon.efi.
It is also possible to add .sbat to all the generated addons, by
populating redhat/addons/sbat/sbat.conf. Syntax is same as the addons
config.
At build time, Makefile will create a tar.gz archive (addons.tar.gz)
containing all the files in redhat/addons. It will then passed to the
kernel specfile that will extract the addons from it and generate the
UKI kernel cmdline addons.
As an example of this feature, add the fips addon to optionally enable fips
(https://issues.redhat.com/browse/RHEL-23049)
---
redhat/addons/fedora/virt/aarch64/sbat/.gitkeep | 0
redhat/addons/fedora/virt/aarch64/fips.addon | 2 +
redhat/addons/fedora/virt/x86_64/fips.addon | 2 +
redhat/addons/rhel/virt/aarch64/sbat/.gitkeep | 0
redhat/addons/rhel/virt/aarch64/fips.addon | 2 +
redhat/addons/rhel/virt/x86_64/fips.addon | 2 +
redhat/scripts/uki_addons.py | 137 ++++++++++++++++++++++++
redhat/Makefile | 9 +
redhat/kernel.spec.template | 45 +++++++
9 files changed, 199 insertions(+), 0 deletions(-)
From: Emanuele Giuseppe Esposito on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2917
We want to enable kernel.spec to optionally ship UKI addons defined in a
common config file in redhat folder.
The folder redhat/addons will contain all addons configs specifying the
UKI kernel cmdline addons to be created in the next build. An addon
config is simply a .addon plain text file, where any line
is taken as kernel cmdline, except for the ones starting with '#',
which will be automatically ignored.
redhat/scripts/uki_addons.py will take care of parsing all configs and
folders in redhat/addons and call 'ukify' to create the actual addons.
The output addon filename will be a concatenation of all folders in
redhat/addons that are part of the addon config path.
For example, an addon config redhat/addons/1/2/3/test.addon will result
in generating redhat/addons_output/1-2-3-test.addon.efi.
It is also possible to add .sbat to all the generated addons, by
populating redhat/addons/sbat/sbat.conf. Syntax is same as the addons
config.
At build time, Makefile will create a tar.gz archive (addons.tar.gz)
containing all the files in redhat/addons. It will then passed to the
kernel specfile that will extract the addons from it and generate the
UKI kernel cmdline addons.
As an example of this feature, add the fips addon to optionally enable fips
(https://issues.redhat.com/browse/RHEL-23049)
---
redhat/addons/fedora/virt/aarch64/sbat/.gitkeep | 0
redhat/addons/fedora/virt/aarch64/fips.addon | 2 +
redhat/addons/fedora/virt/x86_64/fips.addon | 2 +
redhat/addons/rhel/virt/aarch64/sbat/.gitkeep | 0
redhat/addons/rhel/virt/aarch64/fips.addon | 2 +
redhat/addons/rhel/virt/x86_64/fips.addon | 2 +
redhat/scripts/uki_addons.py | 137 ++++++++++++++++++++++++
redhat/Makefile | 9 +
redhat/kernel.spec.template | 45 +++++++
9 files changed, 199 insertions(+), 0 deletions(-)
From: Emanuele Giuseppe Esposito on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2917
We want to enable kernel.spec to optionally ship UKI addons defined in a
common config file in redhat folder.
The folder redhat/addons will contain all addons configs specifying the
UKI kernel cmdline addons to be created in the next build. An addon
config is simply a .addon plain text file, where any line
is taken as kernel cmdline, except for the ones starting with '#',
which will be automatically ignored.
redhat/scripts/uki_addons.py will take care of parsing all configs and
folders in redhat/addons and call 'ukify' to create the actual addons.
The output addon filename will be a concatenation of all folders in
redhat/addons that are part of the addon config path.
For example, an addon config redhat/addons/1/2/3/test.addon will result
in generating redhat/addons_output/1-2-3-test.addon.efi.
It is also possible to add .sbat to all the generated addons, by
populating redhat/addons/sbat/sbat.conf. Syntax is same as the addons
config.
At build time, Makefile will create a tar.gz archive (addons.tar.gz)
containing all the files in redhat/addons. It will then passed to the
kernel specfile that will extract the addons from it and generate the
UKI kernel cmdline addons.
As an example of this feature, add the fips addon to optionally enable fips
(https://issues.redhat.com/browse/RHEL-23049)
---
redhat/addons/fedora/virt/aarch64/sbat/.gitkeep | 0
redhat/addons/fedora/virt/aarch64/fips.addon | 2 +
redhat/addons/fedora/virt/x86_64/fips.addon | 2 +
redhat/addons/rhel/virt/aarch64/sbat/.gitkeep | 0
redhat/addons/rhel/virt/aarch64/fips.addon | 2 +
redhat/addons/rhel/virt/x86_64/fips.addon | 2 +
redhat/scripts/uki_addons.py | 125 ++++++++++++++++++++++++
redhat/Makefile | 9 +
redhat/kernel.spec.template | 45 ++++++++
9 files changed, 187 insertions(+), 0 deletions(-)