[OS-BUILD PATCH] Base automotive-devel on rt-devel

2024-03-26 Thread Don Zickus (via Email Bridge) 
From: Don Zickus 

Base automotive-devel on rt-devel

The -rt kernel will be integrated into the CentOS-Stream/RHEL-10 kernel
and the automotive kernel will be a derivative of that.  So instead of
building the automotive kernel off of os-build, instead build it off of
the os-build-rt-devel kernel which mimics the CS/RHEL10 workflow.

Signed-off-by: Don Zickus 

diff --git a/redhat/scripts/ci/ark-merge-rt.sh 
b/redhat/scripts/ci/ark-merge-rt.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-merge-rt.sh
+++ b/redhat/scripts/ci/ark-merge-rt.sh
@@ -140,8 +140,12 @@ if test "$UPSTREAM_RT_DEVEL_VER" != "$RT_DEVEL_VER" -o \
 
git checkout "$prev_branch"
 # do the git rebase --onto $temp_devel_branch $temp_prev_branch
+   prev_rt_branch="$(git rev-parse --abbrev-ref $RT_DEVEL_BRANCH)"
ark_git_rebase "$RT_DEVEL_BRANCH" "$temp_prev_branch" 
"$temp_devel_branch"
-   ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$temp_prev_branch" 
"$temp_devel_branch"
+
+   # use the pre-rebase rt-devel branch and the post-rebase rt-devel
+   # branch as input to git rebase
+   ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$prev_rt_branch" 
"$RT_DEVEL_BRANCH"
git branch -D "$temp_prev_branch"
git branch -D "$temp_devel_branch"
 fi
@@ -154,9 +158,9 @@ ark_update_configs "$RT_DEVEL_BRANCH" || true
 # skip pushing config update MRs, keep them in pending-rhel
 ark_push_changes "$RT_DEVEL_BRANCH" "skip"
 
-## Build -automotive-devel branch, generate pending-rhel configs
-ark_git_merge "$AUTOMOTIVE_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
-ark_git_merge "$AUTOMOTIVE_DEVEL_BRANCH" 
"$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
+## Build -automotive-devel branch based on the rt-devel branch, generate
+## pending-rhel configs
+ark_git_merge "$AUTOMOTIVE_DEVEL_BRANCH" "$RT_DEVEL_BRANCH"
 # don't care if configs were added or not hence '|| true'
 ark_update_configs "$AUTOMOTIVE_DEVEL_BRANCH" || true
 # skip pushing config update MRs, keep them in pending-rhel

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3047
--
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

[OS-BUILD PATCH] redhat/configs: enable CONFIG_TEST_LOCKUP for debug kernel

2024-03-26 Thread via Email Bridge 
From: Čestmír Kalina 

redhat/configs: enable CONFIG_TEST_LOCKUP for debug kernel

Signed-off-by: Čestmír Kalina 

diff --git a/redhat/configs/common/debug/CONFIG_TEST_LOCKUP 
b/redhat/configs/common/debug/CONFIG_TEST_LOCKUP
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/debug/CONFIG_TEST_LOCKUP
@@ -0,0 +1 @@
+CONFIG_TEST_LOCKUP=m

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3046
--
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

[OS-BUILD PATCH] redhat: make libperf-devel require libperf %{version}-%{release}

2024-03-26 Thread Jan Stancek (via Email Bridge) 
From: Jan Stancek 

redhat: make libperf-devel require libperf %{version}-%{release}

Forward-port of c9s commit:
  a84991c38dd1 ("redhat: make libperf-devel require libperf 
%{version}-%{release}")

Add Requires to address potential issue found by rpminspect:
  Subpackage libperf-devel on aarch64 carries 'Requires: libperf.so()(64bit)'
  which comes from subpackage libperf but does not carry an explicit package
  version requirement. Please add 'Requires: libperf = %{version}-%{release}'
  to the spec file to avoid the need to test interoperability between various
  combinations of old and new subpackages.

Signed-off-by: Jan Stancek 

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
@@ -1133,6 +1133,7 @@ This package contains the kernel source perf library.
 
 %package -n libperf-devel
 Summary: Developement files for the perf library from kernel source
+Requires: libperf = %{version}-%{release}
 %description -n libperf-devel
 This package includes libraries and header files needed for development
 of applications which use perf library from kernel source.

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3045
--
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue