[OS-BUILD PATCHv4 0/0] Add libperf packages and build kernel tools for Fedora
From: Justin M. Forbes on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2907 NOTE: Truncated patchset since committer email 'scwea...@redhat.com' does not match the submitter's GitLab public email address 'jfor...@fedoraproject.org'. When kernel-tools was split out to a separate package in Fedora, it was due to several factors. Most of those issues have been mitigated in other ways, and there are advantages to building tools with the kernel build. Let's turn on tools for Fedora. To do so, we need to add the libperf packages, but this enables them for Fedora only. It is worth noting that the Fedora package for bpftool will retain the upstream kernel versioning. This is because the bpftool versioning scheme is incompatible with the stable Fedora process. --- redhat/kernel.spec.template | 78 ++-- 1 files changed, 74 insertions(+), 4 deletions(-) -- ___ 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 PATCHv11] Add new os-build targets: rt-devel and automotive-devel
From: Don Zickus
Add new os-build targets: rt-devel and automotive-devel
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 tag kernel-N.V.0-0 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 os-build-stable (linux-stable) to linux
master again.
NOTE: The script uses kernel-N.V.0-0 which is rebased after os-build
linux-x.y GA is created but before linux-x.y+1 pre-rc1 merges happen.
The reason for this is because linux-stable-x.y doesn't exist until
linux-x.y+1-rc1 exists thus leaving linux-stable-x.y-1 in the meantime.
An awkward gap exists, use kernel-N.V.0-0 as the base.
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.
Cleanup namespace pollution because shellcheck doesn't like 'local'.
Signed-off-by: Don Zickus
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,24 +8,188 @@ die()
ci_pre_check()
{
- if test -n "${TO_PUSH}"; 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 "
- echo "git remote set-url --push gitlab "
+ if test -z "${GITLAB_PROJECT_URL}" || test -z
"$GITLAB_PROJECT_PUSHURL"; then
+echo "To enable git-push, please run:"
+ echo "git remote add gitlab "
+ echo "git remote set-url --push gitlab "
+ if test -n "${TO_PUSH}"; then
die "Misconfigured 'gitlab' entry for git"
fi
fi
git diff-index --quiet HEAD || die "Dirty tree, please clean before
merging."
}
+# wrapper around branches that may not be exist yet
+ark_git_branch()
+{
+ _target_branch="$1"
+ _source_branch="$2"
+
+ # switch to branch if it exists otherwise create and set to source
+ # branch
+ git show-ref -q --heads "$_target_branch" || \
+ git branch "$_target_branch" "$_source_branch"
+}
+
+# GitLab can only mirror one project at a time. This wrapper function does
+# the mirroring for any other branches.
+ark_git_mirror()
+{
+ target_branch="$1"
+ upstream_tree="$2"
+ source_branch="$3"
+ reset_branch="$4"
+
+ prev_branch="$(git rev-parse --abbrev-ref HEAD)"
+ remote_branch="$upstream_tree/$source_branch"
+ ark_git_branch "$target_branch" "$remote_branch"
+ git checkout "$target_branch"
+ git fetch "$upstream_tree" "$source_branch"
+ if test -z "$reset_branch"; then
+ git merge "$remote_branch" || die "git merge $remote_branch
failed"
+ else
+ git reset --hard "$remote_branch" || die "git reset
$remote_branch failed"
+ fi
+ git checkout "$prev_branch"
+}
+
+# Merge wrapper in case issues arise
+ark_git_merge()
+{
+ source_branch="$1"
+ target_branch="$2"
+ reset_branch="$3"
+
+ prev_branch="$(git rev-parse --abbrev-ref HEAD)"
+ ark_git_branch "$target_branch" "$source_branch"
+ git checkout "$target_branch"
+ if test -n "$reset_branch"; then
+ # there are cases when the initial merge is a reset
+ git reset --hard "$source_branch" || die "git reset
$source_branch failed"
+ elif ! git merge -m "Merge '$source_branch' into '$target_branch'"
"$source_branch"; then
+ git merge --abort
+ printf "Merge conflict; halting!\n"
+ printf "To reproduce:\n"
+ printf "* git checkout %s\n" "${target_branch}"
+ printf "* git merge %s\n" "${source_branch}"
+ die "Merge conflicts"
+ fi
+
+ git checkout "$prev_branch"
+ return 0
+}
+
+ark_git_rebase()
+{
+ rebase_branch="$1"
+ _upstream="$2"
+ _base="$3"
+
+
[OS-BUILD PATCHv2] RHMAINTAINERS: Update for Feb 2 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Feb 2 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -724,7 +724,7 @@ F: Documentation/ABI/testing/sysfs-bus-cxl F: Documentation/driver-api/cxl/memory-devices.rst CONFIGFS -M: Bob Peterson +M: Alexander Aring S: Supported F: fs/configfs/ F: include/linux/configfs.h @@ -851,6 +851,7 @@ F: Documentation/networking/devlink/ F: net/core/devlink.c F: net/devlink/ F: include/net/devlink.h +F: include/trace/events/devlink.h F: include/uapi/linux/devlink.h DIRECT IO @@ -866,7 +867,6 @@ F: drivers/scsi/hpsa* DISTRIBUTED LOCK MANAGER (DLM) M: Alexander Aring R: David Teigland -R: Bob Peterson R: Andreas Gruenbacher S: Supported F: fs/dlm/ @@ -957,6 +957,7 @@ S: Supported F: Documentation/networking/bridge.rst F: net/bridge/ F: include/linux/if_bridge.h +F: include/trace/events/bridge.h F: include/uapi/linux/if_bridge.h F: include/uapi/linux/mrp_bridge.h @@ -1124,7 +1125,6 @@ F:drivers/phy/ F: include/linux/phy/ GFS2 FILE SYSTEM -M: Bob Peterson M: Andreas Gruenbacher R: Abhi Das R: Andrew Price @@ -1205,7 +1205,7 @@ F:drivers/hte/ F: include/linux/hte.h HWMON SUBSYSTEM -M: Dean Nelson +M: David Arcari S: Supported F: drivers/hwmon/ @@ -2026,6 +2026,17 @@ F: include/linux/sock* F: include/linux/tcp.h F: include/linux/tfrc.h F: include/linux/udp.h +F: include/trace/events/fib.h +F: include/trace/events/fib6.h +F: include/trace/events/net_probe_common.h +F: include/trace/events/mptcp.h +F: include/trace/events/napi.h +F: include/trace/events/neigh.h +F: include/trace/events/netlink.h +F: include/trace/events/skb.h +F: include/trace/events/sock.h +F: include/trace/events/tcp.h +F: include/trace/events/udp.h F: include/uapi/asm-generic/socket.h F: include/uapi/linux/*diag.h F: include/uapi/linux/dcbnl.h @@ -2689,6 +2700,7 @@ F:Documentation/networking/sctp.* F: net/sctp/ F: include/linux/sctp.h F: include/net/sctp/ +F: include/trace/events/sctp.h F: include/uapi/linux/sctp.h SECURITY SUBSYSTEM @@ -3211,7 +3223,7 @@ F:Documentation/networking/device_drivers/wwan/ X86 ARCHITECTURE M: David Arcari M: Prarit Bhargava -M: Dean Nelson +R: Steve Best R: Lenny Szubowicz S: Supported F: arch/x86/ @@ -3240,7 +3252,7 @@ X:arch/x86/net/ X86 CPU POWER MANAGEMENT M: Prarit Bhargava M: David Arcari -R: Dean Nelson +R: Steve Best S: Supported F: arch/x86/kernel/cpu/cpufreq/ F: drivers/cpufreq/intel_pstate.c @@ -3249,7 +3261,7 @@ F:drivers/idle/intel_idle.c F: drivers/idle/Kconfig X86 FPU SUBSYSTEM -M: Dean Nelson +M: Steve Best R: David Arcari R: Prarit Bhargava S: Supported @@ -3268,6 +3280,8 @@ F:include/net/netns/xdp.h F: include/net/page_pool.h F: include/net/*xdp* F: include/net/*xsk* +F: include/trace/events/page_pool.h +F: include/trace/events/xdp.h F: include/uapi/linux/*xdp* F: net/core/page_pool.c F: net/core/sock_map.c -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2920 -- ___ 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] RHMAINTAINERS: Update for Feb 2 2024
From: Prarit Bhargava RHMAINTAINERS: Update for Feb 2 2024 Update RHMAINTAINERS to latest. Signed-off-by: Prarit Bhargava diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS index blahblah..blahblah 100644 --- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS +++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS @@ -724,7 +724,7 @@ F: Documentation/ABI/testing/sysfs-bus-cxl F: Documentation/driver-api/cxl/memory-devices.rst CONFIGFS -M: Bob Peterson +M: Alexander Aring S: Supported F: fs/configfs/ F: include/linux/configfs.h @@ -851,6 +851,7 @@ F: Documentation/networking/devlink/ F: net/core/devlink.c F: net/devlink/ F: include/net/devlink.h +F: include/trace/events/devlink.h F: include/uapi/linux/devlink.h DIRECT IO @@ -866,7 +867,6 @@ F: drivers/scsi/hpsa* DISTRIBUTED LOCK MANAGER (DLM) M: Alexander Aring R: David Teigland -R: Bob Peterson R: Andreas Gruenbacher S: Supported F: fs/dlm/ @@ -957,6 +957,7 @@ S: Supported F: Documentation/networking/bridge.rst F: net/bridge/ F: include/linux/if_bridge.h +F: include/trace/events/bridge.h F: include/uapi/linux/if_bridge.h F: include/uapi/linux/mrp_bridge.h @@ -1124,7 +1125,6 @@ F:drivers/phy/ F: include/linux/phy/ GFS2 FILE SYSTEM -M: Bob Peterson M: Andreas Gruenbacher R: Abhi Das R: Andrew Price @@ -1205,7 +1205,7 @@ F:drivers/hte/ F: include/linux/hte.h HWMON SUBSYSTEM -M: Dean Nelson +M: David Arcari S: Supported F: drivers/hwmon/ @@ -2026,6 +2026,17 @@ F: include/linux/sock* F: include/linux/tcp.h F: include/linux/tfrc.h F: include/linux/udp.h +F: include/trace/events/fib.h +F: include/trace/events/fib6.h +F: include/trace/events/net_probe_common.h +F: include/trace/events/mptcp.h +F: include/trace/events/napi.h +F: include/trace/events/neigh.h +F: include/trace/events/netlink.h +F: include/trace/events/skb.h +F: include/trace/events/sock.h +F: include/trace/events/tcp.h +F: include/trace/events/udp.h F: include/uapi/asm-generic/socket.h F: include/uapi/linux/*diag.h F: include/uapi/linux/dcbnl.h @@ -2689,6 +2700,7 @@ F:Documentation/networking/sctp.* F: net/sctp/ F: include/linux/sctp.h F: include/net/sctp/ +F: include/trace/events/sctp.h F: include/uapi/linux/sctp.h SECURITY SUBSYSTEM @@ -3211,7 +3223,7 @@ F:Documentation/networking/device_drivers/wwan/ X86 ARCHITECTURE M: David Arcari M: Prarit Bhargava -M: Dean Nelson +R: Steve Best R: Lenny Szubowicz S: Supported F: arch/x86/ @@ -3240,7 +3252,7 @@ X:arch/x86/net/ X86 CPU POWER MANAGEMENT M: Prarit Bhargava M: David Arcari -R: Dean Nelson +R: Steve Best S: Supported F: arch/x86/kernel/cpu/cpufreq/ F: drivers/cpufreq/intel_pstate.c @@ -3249,7 +3261,7 @@ F:drivers/idle/intel_idle.c F: drivers/idle/Kconfig X86 FPU SUBSYSTEM -M: Dean Nelson +M: Steve Best R: David Arcari R: Prarit Bhargava S: Supported @@ -3268,6 +3280,8 @@ F:include/net/netns/xdp.h F: include/net/page_pool.h F: include/net/*xdp* F: include/net/*xsk* +F: include/trace/events/page_pool.h +F: include/trace/events/xdp.h F: include/uapi/linux/*xdp* F: net/core/page_pool.c F: net/core/sock_map.c -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2920 -- ___ 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
Re: [OS-BUILD PATCHv3 0/5] Add libperf packages and build kernel tools for Fedora
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2907#note_1755476971 Sure I approved it. I think we want to resolve this thread as well. I'll leave that to any of you to resolve it. -- ___ 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
Re: [OS-BUILD PATCH 0/2] gitlab-ci: disable Rawhide clang pipelines
From: Michael Hofmann on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2919#note_1755382353 closing as that seems fixed with https://gitlab.com/cki-project/kernel- ark/-/merge_requests/2918 -- ___ 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
Re: [OS-BUILD PATCHv5 0/2] spec: use jsut-built bpftool for vmlinux.h generation
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2884#note_1755301395 Thank you @artem.savkov . Just FYI, kernel-ark project MRs do not use or recognize Bugzilla & JIRA tags. -- ___ 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
