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: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2654
Compiling for clang is getting trickier to do because the configs are
different than gcc in some cases. Mimic the kgcov framework to setup
clang to be easier to update their configs.
This framework is designed to blindly merge.py with any configs fed to
it. This is unlike the build_configs framework where it uses
priority.rhel|fedora rules to merge things.
This leads to strange cases where clang debug configs need different
settings than clang non-debug configs. For non-lto clang, due to clang
bugs it is easy to disable the debug features and get away with this.
But once resolved we will have to reinvestigate. For lto clang, I just
hack out the debug and kgcov config files due to clashing Kconfig depend
rules.
I don't expect this to be a long term solution. Perhaps when our config
rework is fully realized this just melts away. TBD.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/configs/common/clang/debug/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/debug/CONFIG_KMSAN | 1 +
redhat/configs/common/clang/generic/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/generic/CONFIG_KMSAN | 1 +
redhat/configs/common/clang_lto/debug/README | 0
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/README | 0
redhat/configs/priority.fedora | 4 -
redhat/configs/priority.rhel | 4 -
redhat/configs/priority.snip | 9 +
redhat/kernel.spec.template | 77 ++++++---
14 files changed, 70 insertions(+), 32 deletions(-)
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2686
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: XFS_ONLINE_SCRUB_STATS [=y]
Type : bool
Defined at fs/xfs/Kconfig:146
Prompt: XFS online metadata check usage data collection
Depends on: BLOCK [=y] && XFS_ONLINE_SCRUB [=y]
Location:
-> File systems
-> XFS online metadata check support (XFS_ONLINE_SCRUB [=y])
-> XFS online metadata check usage data collection
(XFS_ONLINE_SCRUB_STATS [=y])
Selects: FS_DEBUG
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/pending-rhel/generic/CONFIG_XFS_ASSERT_FATAL | 13 ---------
redhat/configs/pending-rhel/generic/CONFIG_XFS_ONLINE_SCRUB_STATS | 14 ----------
redhat/configs/rhel/generic/CONFIG_XFS_ONLINE_SCRUB_STATS | 1 +
3 files changed, 1 insertions(+), 27 deletions(-)
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2654
Compiling for clang is getting trickier to do because the configs are
different than gcc in some cases. Mimic the kgcov framework to setup
clang to be easier to update their configs.
This framework is designed to blindly merge.py with any configs fed to
it. This is unlike the build_configs framework where it uses
priority.rhel|fedora rules to merge things.
This leads to strange cases where clang debug configs need different
settings than clang non-debug configs. For non-lto clang, due to clang
bugs it is easy to disable the debug features and get away with this.
But once resolved we will have to reinvestigate. For lto clang, I just
hack out the debug and kgcov config files due to clashing Kconfig depend
rules.
I don't expect this to be a long term solution. Perhaps when our config
rework is fully realized this just melts away. TBD.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/configs/common/clang/debug/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/debug/CONFIG_KMSAN | 1 +
redhat/configs/common/clang/generic/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/generic/CONFIG_KMSAN | 1 +
redhat/configs/common/clang_lto/debug/README | 0
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/README | 0
redhat/configs/priority.fedora | 4 -
redhat/configs/priority.rhel | 4 -
redhat/configs/priority.snip | 9 +
redhat/kernel.spec.template | 78 ++++++---
14 files changed, 71 insertions(+), 32 deletions(-)
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2732
This is an attempt to automate the rt and automotive devel branches
using the upstream linux-rt-devel tree as the base combined with
os-build.
The overall process isn't too complicated but there are enough steps to
make it compilicated.
Steps:
* map upstream linux-rt-devel to master-rt branch
* update os-build
* grab linux version from master-rt and os-build
* if version the same then merge os-build and master-rt to
os-build-rt-automated
* else merge linux-stable and master-rt to os-build-rt-automated until
master-rt is update to os-build
* merge os-build-rt-automated into os-build-rt-devel
* merge os-build-rt-automated into os-build-automotive-devel
* run the generate pending-rhel config scripts on rt-devel and
automotive-devel
The script has beginning logic to handle rebasing if necessary when the
rt-devel branch transitions from linux-stable to linux master again.
The script has no effect on the day-to-day operations of os-build. They
are designed to be run from a gitlab cron job and update in the
background. Once they are deemed stable, adding ARK MRs that target
either os-build-rt-devel or os-build-automotive-devel will be possible
and those branches can start proper parallel developement with os-build.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/scripts/ci/ark-ci-env.sh | 151 +++++++++++++++++++++++++++
redhat/scripts/ci/ark-merge-rt.sh | 96 +++++++++++++++++
redhat/scripts/ci/ark-update-configs.sh | 4 +-
redhat/scripts/genspec/gen_config_patches.sh | 12 +-
4 files changed, 258 insertions(+), 5 deletions(-)
From: Don Zickus <dzickus(a)redhat.com>
Add target_branch for gen_config_patches.sh
To support new config updates in other brances besides os-build, we need
to be more flexible with the staging branch. Currently new configs get
added to configs/$date/<new CONFIG>. This won't work when new branches
like os-build-rt-devel and os-build-automotive-devel get implemented as
they will have duplicate entries here and cause script problems. Add a
$branch name into the configs path to create separation.
configs/$date/<new CONFIG> -->
configs/$target_branch/$date/<new CONFIG>
This is not expected to impact anything else.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -73,7 +73,7 @@ new_head="$(git rev-parse HEAD)"
[ "$old_head" != "$new_head" ] && CONFIGS_ADDED="1" || CONFIGS_ADDED=""
if test "$CONFIGS_ADDED"; then
- ./redhat/scripts/genspec/gen_config_patches.sh
+ ./redhat/scripts/genspec/gen_config_patches.sh "${BRANCH}"
PUSH_VERB="Pushing"
else
printf "No new configuration values exposed from merging %s into $BRANCH\n" "$UPSTREAM_REF"
@@ -84,7 +84,7 @@ echo
PUSH_STR="branch ${BRANCH} to ${GITLAB_PROJECT_URL}"
PUSH_CMD="git push gitlab ${BRANCH}"
PUSH_CONFIG_STR="config update branches"
-PUSH_CONFIG_CMD="for branch in \$(git branch | grep configs/\"\$(date +%F)\"); do
+PUSH_CONFIG_CMD="for branch in \$(git branch | grep configs/${BRANCH}/\"\$(date +%F)\"); do
git push \\
-o merge_request.create \\
-o merge_request.target=\"$BRANCH\" \\
diff --git a/redhat/scripts/genspec/gen_config_patches.sh b/redhat/scripts/genspec/gen_config_patches.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/genspec/gen_config_patches.sh
+++ b/redhat/scripts/genspec/gen_config_patches.sh
@@ -8,6 +8,10 @@
# information for the relevant maintainers using get_maintainers.pl. This
# requires that you have $RHMAINTAINERS pointing to a valid maintainer file.
+target_branch=$1
+prev_branch="$(git rev-parse --abbrev-ref HEAD)"
+git checkout "$target_branch"
+
if ! git show -s --oneline HEAD | grep -q "AUTOMATIC: New configs"; then
echo "The git HEAD doesn't look like the correct commit"
exit 1
@@ -116,12 +120,14 @@ for f in "$config_bundles_dir"/*; do
rm redhat/configs/pending-rhel/generic/"$line"
done < "$f"
# We do a separate branch per config commit
- if ! git checkout -b "configs/$(date +%F)/$_f"; then
- printf "Unable to check out configs/%s/%s branch!\n" "$(date +%F)" "$_f"
+ if ! git checkout -b "configs/$target_branch/$(date +%F)/$_f"; then
+ printf "Unable to check out configs/%s/%s/%s branch!\n" "$target_branch" "$(date +%F)" "$_f"
exit 1
fi
# One file path is done, time to commit!
git add redhat/configs
git commit -s -F "$tmpdir"/commit
- git checkout os-build
+ git checkout "$target_branch"
done
+
+git checkout "$prev_branch"
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2731
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2654
Compiling for clang is getting trickier to do because the configs are
different than gcc in some cases. Mimic the kgcov framework to setup
clang to be easier to update their configs.
This framework is designed to blindly merge.py with any configs fed to
it. This is unlike the build_configs framework where it uses
priority.rhel|fedora rules to merge things.
This leads to strange cases where clang debug configs need different
settings than clang non-debug configs. For non-lto clang, due to clang
bugs it is easy to disable the debug features and get away with this.
But once resolved we will have to reinvestigate. For lto clang, I just
hack out the debug and kgcov config files due to clashing Kconfig depend
rules.
I don't expect this to be a long term solution. Perhaps when our config
rework is fully realized this just melts away. TBD.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/configs/common/clang/debug/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/debug/CONFIG_KMSAN | 1 +
redhat/configs/common/clang/generic/CONFIG_KASAN_STACK | 1 +
redhat/configs/common/clang/generic/CONFIG_KMSAN | 1 +
redhat/configs/common/clang_lto/debug/README | 0
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/arm/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_CLANG_THIN | 1 +
redhat/configs/common/clang_lto/generic/x86/CONFIG_LTO_NONE | 1 +
redhat/configs/common/clang_lto/generic/README | 0
redhat/configs/priority.fedora | 4 -
redhat/configs/priority.rhel | 4 -
redhat/configs/priority.snip | 9 +
redhat/kernel.spec.template | 78 ++++++---
14 files changed, 70 insertions(+), 33 deletions(-)
From: Javier Martinez Canillas <javierm(a)redhat.com>
fedora: Switch TI_SCI_CLK and TI_SCI_PM_DOMAINS symbols to built-in
These two are currently built as a module, but this prevents the K3 AM6xx
boards to boot. For example, an AM625 BeaglePlay hangs on boot after this:
## Flattened Device Tree blob at ffb0e8e0
Booting using the fdt blob at 0xffb0e8e0
Working FDT set to ffb0e8e0
Loading Ramdisk to 8bcb0000, end 8ffff195 ... OK
Loading Device Tree to 000000008bc9c000, end 000000008bcaf4a7 ... OK
Working FDT set to 8bc9c000
Starting kernel ...
I/TC: Secondary CPU 1 initializing
I/TC: Secondary CPU 1 switching to normal world boot
I/TC: Secondary CPU 2 initializing
I/TC: Secondary CPU 2 switching to normal world boot
I/TC: Secondary CPU 3 initializing
I/TC: Secondary CPU 3 switching to normal world boot
With these two symbols built-in the board continues with the boot process.
Reported-by: Enric Balletbo i Serra <eballetbo(a)redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_CLK
@@ -1 +1 @@
-CONFIG_TI_SCI_CLK=m
+CONFIG_TI_SCI_CLK=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TI_SCI_PM_DOMAINS
@@ -1 +1 @@
-CONFIG_TI_SCI_PM_DOMAINS=m
+CONFIG_TI_SCI_PM_DOMAINS=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2727
From: Steve Best <sbest(a)redhat.com>
redhat/configs: NXP BBNSM Power Key Driver
Description:
Turn on NXP BBNSM Power Key Driver
Tested: make dist-configs
Signed-off-by: Steve Best <sbest(a)redhat.com>
diff --git a/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY
+++ b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_INPUT_BBNSM_PWRKEY
@@ -1 +1 @@
-# CONFIG_INPUT_BBNSM_PWRKEY is not set
+CONFIG_INPUT_BBNSM_PWRKEY=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2725
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 106602712
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/105827
One or more kernel tests failed:
We also see the following known issues which are not related to your changes:
Issue: NFS Connectathon: SELinux prevents rpcbind
URL: https://bugzilla.redhat.com/1758147
Affected tests:
aarch64 - Filesystem - NFS Connectathon
ppc64le - Filesystem - NFS Connectathon
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Prarit Bhargava <prarit(a)redhat.com>
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -298,8 +298,6 @@ Summary: The Linux kernel
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-# selftests turns on bpftool
-%define with_selftests 0
# No realtime fedora variants
%define with_realtime 0
%define with_arm64_64k 0
@@ -445,9 +443,9 @@ Summary: The Linux kernel
%define use_vdso 1
%endif
-# selftests require bpftool to be built
-%if %{with_selftests}
-%define with_bpftool 1
+# selftests require bpftool to be built. If bpftools is disabled, then disable selftests
+%if %{with_bpftool} == 0
+%define with_selftests 0
%endif
%ifnarch noarch
@@ -2716,12 +2714,14 @@ if [ -f $DevelDir/vmlinux.h ]; then
RPM_VMLINUX_H=$DevelDir/vmlinux.h
fi
+%if %{with_bpftool}
%global bpftool_make \
%{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1
-%if %{with_bpftool}
pushd tools/bpf/bpftool
%{bpftool_make}
popd
+%else
+echo "bpftools disabled ... disabling selftests"
%endif
%if %{with_selftests}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2723
There are subpackages that won't compile due to architectural differences
and cross compiling packaging issues. Disable these packages from cross
compiling. This shouldn't be a shock as CKI is not building these in
cross compiles either.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/Makefile.cross | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
From: Michael Hofmann on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2719
Currently, it is possible to only build the base variant by specifying
`--without debug`. The same is not true if one wants to only build the
debug variant.
Using `--with dbgonly` will disable base variants, but will also disable a
variety of other subpackages.
Keeping the design pattern introduced by `--without debug`, add a
`--without base`. Rework `--with dbgonly` to be a superset of this.
Convert `.gitlab-ci.yml` to use `--without debug` and --without base` to
select kernel variants.
This requires https://gitlab.com/cki-project/pipeline-
definition/-/merge_requests/1836 to be merged first. This ensures debug
kernels automatically get a `--without base`.
Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com>
---
redhat/kernel.spec.template | 13 ++++++++-----
.gitlab-ci.yml | 16 ++++++++--------
2 files changed, 16 insertions(+), 13 deletions(-)
From: Michael Hofmann on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2719
Currently, it is possible to only build the base variant by specifying
`--without debug`. The same is not true if one wants to only build the
debug variant.
Using `--with dbgonly` will disable base variants, but will also disable a
variety of other subpackages.
Keeping the design pattern introduced by `--without debug`, add a
`--without base`. Rework `--with dbgonly` to be a superset of this.
Convert `.gitlab-ci.yml` to use `--without debug` and --without base` to
select kernel variants.
This requires https://gitlab.com/cki-project/pipeline-
definition/-/merge_requests/1836 to be merged first. This ensures debug
kernels automatically get a `--without base`.
Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com>
---
redhat/kernel.spec.template | 13 ++++++++-----
.gitlab-ci.yml | 16 ++++++++--------
2 files changed, 16 insertions(+), 13 deletions(-)
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 106387241
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/105093
One or more kernel tests failed:
We also see the following known issues which are not related to your changes:
Issue: NFS Connectathon: SELinux prevents rpcbind
URL: https://bugzilla.redhat.com/1758147
Affected tests:
aarch64 - Filesystem - NFS Connectathon
x86_64 - Filesystem - NFS Connectathon
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Prarit Bhargava <prarit(a)redhat.com>
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -298,8 +298,6 @@ Summary: The Linux kernel
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-# selftests turns on bpftool
-%define with_selftests 0
# No realtime fedora variants
%define with_realtime 0
%define with_arm64_64k 0
@@ -445,9 +443,10 @@ Summary: The Linux kernel
%define use_vdso 1
%endif
-# selftests require bpftool to be built
-%if %{with_selftests}
-%define with_bpftool 1
+# selftests require bpftool to be built. If bpftools is disabled, then disable selftests
+%if %{with_bpftool} == 0
+%{echo:bpftools disabled ... disabling selftests}
+%define with_selftests 0
%endif
%ifnarch noarch
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720
From: Prarit Bhargava <prarit(a)redhat.com>
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -447,8 +447,13 @@ Summary: The Linux kernel
# selftests require bpftool to be built
%if %{with_selftests}
+%if %{with_bpftool} == 0
+%{echo:Disabling selftests build: '--without bpftool' specified}
+%define with_selftests 0
+%else
%define with_bpftool 1
%endif
+%endif
%ifnarch noarch
%define with_kernel_abi_stablelists 0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2709
NOTE: Truncated patchset since committer email 'mhofmann(a)redhat.com'
does not match the submitter's GitLab public email address
'dzickus(a)redhat.com'.
There is no easy way to test or debug scheduled job .gitlab-ci.yml
changes. Add infrastructure to allow pushes to a test-os-build area and
a scheduled job to play that branch.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
.gitlab-ci.yml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 106142729
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/104298
One or more kernel tests failed:
We also see the following known issues which are not related to your changes:
Issue: NFS Connectathon: SELinux prevents rpcbind
URL: https://bugzilla.redhat.com/1758147
Affected tests:
s390x - Filesystem - NFS Connectathon
x86_64 - Filesystem - NFS Connectathon
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Jarkko Sakkinen <jarkko(a)kernel.org>
tpm: Enable hwrng only for Pluton on AMD CPUs
The vendor check introduced by commit 554b841d4703 ("tpm: Disable RNG for
all AMD fTPMs") doesn't work properly on a number of Intel fTPMs. On the
reported systems the TPM doesn't reply at bootup and returns back the
command code. This makes the TPM fail probe on Lenovo Legion Y540 laptop.
Since only Microsoft Pluton is the only known combination of AMD CPU and
fTPM from other vendor, disable hwrng otherwise. In order to make sysadmin
aware of this, print also info message to the klog.
Cc: stable(a)vger.kernel.org
Fixes: 554b841d4703 ("tpm: Disable RNG for all AMD fTPMs")
Reported-by: Todd Brandt <todd.e.brandt(a)intel.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217804
Reported-by: Patrick Steinhardt <ps(a)pks.im>
Reported-by: Raymond Jay Golo <rjgolo(a)gmail.com>
Reported-by: Ronan Pigott <ronan(a)rjp.ie>
Reviewed-by: Jerry Snitselaar <jsnitsel(a)redhat.com>
Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org>
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index blahblah..blahblah 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -463,28 +463,6 @@ static bool crb_req_canceled(struct tpm_chip *chip, u8 status)
return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE;
}
-static int crb_check_flags(struct tpm_chip *chip)
-{
- u32 val;
- int ret;
-
- ret = crb_request_locality(chip, 0);
- if (ret)
- return ret;
-
- ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL);
- if (ret)
- goto release;
-
- if (val == 0x414D4400U /* AMD */)
- chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED;
-
-release:
- crb_relinquish_locality(chip, 0);
-
- return ret;
-}
-
static const struct tpm_class_ops tpm_crb = {
.flags = TPM_OPS_AUTO_STARTUP,
.status = crb_status,
@@ -826,9 +804,14 @@ static int crb_acpi_add(struct acpi_device *device)
if (rc)
goto out;
- rc = crb_check_flags(chip);
- if (rc)
- goto out;
+#ifdef CONFIG_X86
+ /* A quirk for https://www.amd.com/en/support/kb/faq/pa-410 */
+ if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
+ priv->sm != ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON) {
+ dev_info(dev, "Disabling hwrng\n");
+ chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED;
+ }
+#endif /* CONFIG_X86 */
rc = tpm_chip_register(chip);
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2706
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/docs: Add a mention of bugzilla for bugs
RHEL has moved to Jira, and it is important to let users know that Fedora
remains on Bugzilla. Add a section on reporting bugs that points users to
Bugzilla.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/docs/submitting-contributions.rst b/redhat/docs/submitting-contributions.rst
index blahblah..blahblah 100644
--- a/redhat/docs/submitting-contributions.rst
+++ b/redhat/docs/submitting-contributions.rst
@@ -33,6 +33,11 @@ enforced by CI. You can check your changes locally with::
make SPHINXOPTS="-W" html
+Reporting Bugs
+==============
+
+Fedora bugs are only tracked in Red Hat's Bugzilla instance. Fedora kernel bugs can be filed at https://bugzilla.redhat.com/ under Product "Fedora" and Component "kernel". Please try to be as detailed as possible when reporting a bug. The more detailed you are, the more likely it is that your bug will be resolved.
+
Patches
=======
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2715
Hey All,
I would like to invite all of you to participate in the Kernel 6.5
Test week is happening from 2023-09-10 to 2023-09-17. It's
fairly simple, head over to the wiki [0] and read in detail about the
test week and simply run the test case mentioned in[1] and enter your
results.
As usual, the Fedora QA team will hangout at #fedora-test-day(a)libera.chat
for questions and discussion.
[0] http://fedoraproject.org/wiki/Test_Day:2023-09-10_Kernel_6.5_Test_Week
[1] https://testdays.fedoraproject.org/events/166
--
//sumantro
Fedora QE
TRIED AND PERSONALLY TESTED, ERGO TRUSTED
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2709
NOTE: Truncated patchset since committer email 'mhofmann(a)redhat.com'
does not match the submitter's GitLab public email address
'dzickus(a)redhat.com'.
There is no easy way to test or debug scheduled job .gitlab-ci.yml
changes. Add infrastructure to allow pushes to a test-os-build area and
a scheduled job to play that branch.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
.gitlab-ci.yml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
From: Don Zickus <dzickus(a)redhat.com>
Fix the fixup of Fedora release
My previous attempt at this fix appeared to show testing worked. Upon
closer inspection, GITLAB_URL needs to be a highlevel domain and not
project specific otherwise you get a 403 return code.
Just rename the variable to not be GITLAB_URL and all is well again.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/scripts/ci/ark-ci-env.sh b/redhat/scripts/ci/ark-ci-env.sh
index blahblah..blahblah 100644
--- a/redhat/scripts/ci/ark-ci-env.sh
+++ b/redhat/scripts/ci/ark-ci-env.sh
@@ -9,7 +9,7 @@ die()
ci_pre_check()
{
if test -n "${TO_PUSH}"; then
- if test -z "${GITLAB_URL}" || test -z "$GITLAB_PUSHURL"; then
+ if test -z "${GITLAB_PROJECT_URL}" || test -z "$GITLAB_PROJECT_PUSHURL"; then
echo "To enable git-push, please run:"
echo "git remote add gitlab <url>"
echo "git remote set-url --push gitlab <pushurl>"
@@ -24,8 +24,8 @@ UPSTREAM_REF=${1:-"master"}
BRANCH=${2:-"os-build"}
PROJECT_ID=${PROJECT_ID:-"13604247"}
TO_PUSH=${DIST_PUSH:-""}
-GITLAB_URL="$(git remote get-url gitlab 2>/dev/null)"
-GITLAB_PUSHURL="$(git config --get remote.gitlab.pushurl 2>/dev/null)"
+GITLAB_PROJECT_URL="$(git remote get-url gitlab 2>/dev/null)"
+GITLAB_PROJECT_PUSHURL="$(git config --get remote.gitlab.pushurl 2>/dev/null)"
ci_pre_check
@@ -33,5 +33,5 @@ export UPSTREAM_REF
export BRANCH
export PROJECT_ID
export TO_PUSH
-export GITLAB_URL
-export GITLAB_PUSHURL
+export GITLAB_PROJECT_URL
+export GITLAB_PROJECT_PUSHURL
diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -81,7 +81,7 @@ else
fi
echo
-PUSH_STR="branch ${BRANCH} to ${GITLAB_URL}"
+PUSH_STR="branch ${BRANCH} to ${GITLAB_PROJECT_URL}"
PUSH_CMD="git push gitlab ${BRANCH}"
PUSH_CONFIG_STR="config update branches"
PUSH_CONFIG_CMD="for branch in \$(git branch | grep configs/\"\$(date +%F)\"); do
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2712
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 105840869
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/103319
One or more kernel tests failed:
We also see the following known issues which are not related to your changes:
Issue: NFS Connectathon: SELinux prevents rpcbind
URL: https://bugzilla.redhat.com/1758147
Affected tests:
x86_64 - Filesystem - NFS Connectathon
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Don Zickus <dzickus(a)redhat.com>
Fix Fedora release scheduled job
Current scheduled job for release Fedora kernels passes but skips over
including labeled MRs with 'Include in Releases' because of
No connection adapters were found for 'git@gitlab.com:cki-project/kernel-ark.git/api/v4/user'
When cleaning up the ci scripts, commit 376f5f93f3619b added a
ark-ci-env.sh to source for ark-create-release.sh. This script added
some generic functions and exports for other ci scripts to use.
One of the added exports was GITLAB_URL which is used by the python
gitlab cli to control the destination of the remote request. That url
was git@gitlab.com:cki-project/kernel-ark.git, which doesn't have a
acceptable connector for python-requests like 'https://'.
GITLAB_URL is more for verifying the right infrastructure is defined.
So tweak the scripts to set https:// for GITLAB_URL and use the ssh
method for GITLAB_PUSHURL. Then update the checks to verify they exist
before running the script.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -243,7 +243,8 @@ eln_64k_debug_baseline:
- chmod 700 ~/.ssh
- echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
- - git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
+ - git remote add gitlab https://gitlab.com/cki-project/kernel-ark.git
+ - git remote set-url --push gitlab git@gitlab.com:cki-project/kernel-ark.git
- gpg2 --import "$TORVALDS_GPG_KEY"
- git checkout --track origin/master && git describe
- git checkout --track origin/os-build && git describe
diff --git a/redhat/scripts/ci/ark-ci-env.sh b/redhat/scripts/ci/ark-ci-env.sh
index blahblah..blahblah 100644
--- a/redhat/scripts/ci/ark-ci-env.sh
+++ b/redhat/scripts/ci/ark-ci-env.sh
@@ -8,8 +8,13 @@ die()
ci_pre_check()
{
- if test -n "${TO_PUSH}" && test -z "${GITLAB_URL}"; then
- die "Please run 'git remote add gitlab <url>' to enable git-push."
+ if test -n "${TO_PUSH}"; then
+ if test -z "${GITLAB_URL}" || test -z "$GITLAB_PUSHURL"; then
+ echo "To enable git-push, please run:"
+ echo "git remote add gitlab <url>"
+ echo "git remote set-url --push gitlab <pushurl>"
+ die "Misconfigured 'gitlab' entry for git"
+ fi
fi
git diff-index --quiet HEAD || die "Dirty tree, please clean before merging."
}
@@ -20,6 +25,7 @@ BRANCH=${2:-"os-build"}
PROJECT_ID=${PROJECT_ID:-"13604247"}
TO_PUSH=${DIST_PUSH:-""}
GITLAB_URL="$(git remote get-url gitlab 2>/dev/null)"
+GITLAB_PUSHURL="$(git config --get remote.gitlab.pushurl 2>/dev/null)"
ci_pre_check
@@ -28,3 +34,4 @@ export BRANCH
export PROJECT_ID
export TO_PUSH
export GITLAB_URL
+export GITLAB_PUSHURL
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2708
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 105661850
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/102794
One or more kernel tests failed:
We also see the following known issues which are not related to your changes:
Issue: NFS Connectathon: SELinux prevents rpcbind
URL: https://bugzilla.redhat.com/1758147
Affected tests:
ppc64le - Filesystem - NFS Connectathon
x86_64 - Filesystem - NFS Connectathon
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Scott Weaver <scweaver(a)redhat.com>
CONFIG_HW_RANDOM_HISI: move to common and set to m
CONFIG_HW_RANDOM_HISI is arm specific and can be unified as a module for
Fedora and RHEL.
This addresses: https://gitlab.com/cki-project/kernel-ark/-/issues/102
Suggested-by: Thomas Huth <thuth(a)redhat.com>
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_HISI b/redhat/configs/common/generic/arm/aarch64/CONFIG_HW_RANDOM_HISI
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_HISI
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_HW_RANDOM_HISI
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_HISI
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_HW_RANDOM_HISI
diff --git a/redhat/configs/rhel/generic/CONFIG_HW_RANDOM_HISI b/redhat/configs/rhel/generic/CONFIG_HW_RANDOM_HISI
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_HW_RANDOM_HISI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_HISI=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2694
From: Vitaly Kuznetsov on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648
Be more picky about kernel's source code licenses:
- Keep track of all currently used license in specfile template.
- Add a selftest which checks all currently present license identifiers
against License:.
Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com>
---
redhat/scripts/kspdx-tool/kspdx.py | 231 +++++++++++++++++++++++++++++++
redhat/self-test/1007-spdx-licenses.bats | 60 ++++++++
redhat/Makefile | 10 +
redhat/kernel.spec.template | 9 +-
4 files changed, 302 insertions(+), 8 deletions(-)