kernel January 2024

kernel@lists.fedoraproject.org

5 participants
83 discussions

[OS-BUILD PATCHv4 0/2] redhat/Makefile: deduplicate and fix KABI tarball creation code
by Ondrej Mosnáček (via Email Bridge) 20 Jan '24

20 Jan '24

From: Ondrej Mosnáček on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892 (see individual commits for explanation) Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> --- redhat/Makefile | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)

1 2

✅ PASS (MISSED 6 of 118): Test report for 6.7.0-200.fc39 (kernel-fedora)
by cki-project＠redhat.com 20 Jan '24

20 Jan '24

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: 111995681 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/124411 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 Tests that were not ran because of internal issues: ppc64le - CKI/restraint ppc64le - SELinux Custom Module Setup ppc64le - machineinfo ppc64le - Boot test ppc64le - selinux-policy: serge-testsuite ppc64le - Reboot test 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 `-' ______________________________________________________________________________

1 0

[OS-BUILD PATCHv3 0/2] redhat/Makefile: add missing dependencies on dist-kabi
by Ondrej Mosnáček (via Email Bridge) 19 Jan '24

19 Jan '24

From: Ondrej Mosnáček on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892 The recipes for $(KABI_TARBALL) and sources-rh reference the kabi/kabi-current file, but they don't depend on the target that creates it (dist-kabi), leading to occasional build failures under parallel build (make -j). Fix it by adding the missing dependencies. Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> --- redhat/Makefile | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)

1 2

[OS-BUILD PATCH] Remove CONFIG_NET_EMATCH_STACK file for RHEL
by Justin M. Forbes (via Email Bridge) 19 Jan '24

19 Jan '24

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Remove CONFIG_NET_EMATCH_STACK file for RHEL This file was set to: CONFIG_NET_EMATCH_STACK is not set Unofortunately that is not a valid entry for this. It would require an integer. In the past, Kconfig didn't care so much, but recent changes make Kconfig error out on this and kill the build. We can simply delete the entry because CONFIG_NET_EMATCH is not set for RHEL either, and that is the only thing with a dep on CONFIG_NET_EMATCH_STACK. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/rhel/generic/CONFIG_NET_EMATCH_STACK b/redhat/configs/rhel/generic/CONFIG_NET_EMATCH_STACK deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_NET_EMATCH_STACK +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NET_EMATCH_STACK is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2900

1 0

[OS-BUILD PATCH] [redhat] move wwan_hwsim to internals rpm
by José Ignacio Tornos Martínez (via Email Bridge) 19 Jan '24

19 Jan '24

From: Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> [redhat] move wwan_hwsim to internals rpm wwan_hwsim is useful for testing and was initially included in extra rpm. Better to move it to internals rpm as with other simulation modules like mac80211_hwsim. Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> diff --git a/redhat/fedora_files/mod-extra.list.fedora b/redhat/fedora_files/mod-extra.list.fedora index blahblah..blahblah 100644 --- a/redhat/fedora_files/mod-extra.list.fedora +++ b/redhat/fedora_files/mod-extra.list.fedora @@ -196,6 +196,5 @@ wanrouter.ko warrior.ko whci.ko wire.ko -wwan_hwsim.ko yam.ko zhenhua.ko diff --git a/redhat/rhel_files/mod-extra.list.rhel b/redhat/rhel_files/mod-extra.list.rhel index blahblah..blahblah 100644 --- a/redhat/rhel_files/mod-extra.list.rhel +++ b/redhat/rhel_files/mod-extra.list.rhel @@ -257,7 +257,6 @@ wanrouter.ko warrior.ko whci.ko wire.ko -wwan_hwsim.ko xt_addrtype.ko xt_AUDIT.ko xt_bpf.ko diff --git a/redhat/scripts/mod/mod-internal.list b/redhat/scripts/mod/mod-internal.list index blahblah..blahblah 100644 --- a/redhat/scripts/mod/mod-internal.list +++ b/redhat/scripts/mod/mod-internal.list @@ -96,3 +96,4 @@ test_sort test_vmalloc time_test torture +wwan_hwsim -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2893

1 0

[OS-BUILD PATCHv2] redhat/Makefile: add missing dependencies on dist-kabi
by Ondrej Mosnáček (via Email Bridge) 18 Jan '24

18 Jan '24

From: Ondrej Mosnacek <omosnace(a)redhat.com> redhat/Makefile: add missing dependencies on dist-kabi The recipes for $(KABI_TARBALL) and sources-rh reference the kabi/kabi-current file, but they don't depend on the target that creates it (dist-kabi), leading to occasional build failures under parallel build (make -j). Fix it by adding the missing dependencies. Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -601,7 +601,7 @@ $(TARBALL): @scripts/create-tarball.sh .PHONY: $(KABI_TARBALL) -$(KABI_TARBALL): +$(KABI_TARBALL): dist-kabi @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)* kabi-current) .PHONY: $(KABIDW_TARBALL) @@ -668,7 +668,7 @@ generate-testpatch-tmp: ":(exclude,top)Makefile.rhelver" \ ":(exclude,top)redhat" > $(TESTPATCH).tmp -sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check +sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-kabi dist-configs-check @cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/ @touch $(TESTPATCH) @diff $(TESTPATCH).tmp $(TESTPATCH) > /dev/null || \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892

1 0

[OS-BUILD PATCH] redhat/Makefile: fix race condition when making the KABI tarball
by Ondrej Mosnáček (via Email Bridge) 18 Jan '24

18 Jan '24

From: Ondrej Mosnacek <omosnace(a)redhat.com> redhat/Makefile: fix race condition when making the KABI tarball The recipe for $(KABI_TARBALL) references the kabi/kabi-current file, but it doesn't depend on the target that creates it (dist-kabi), leading to occasional build failures under parallel build (make -j). Fix it by making $(KABI_TARBALL) depend on dist-kabi. Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -601,7 +601,7 @@ $(TARBALL): @scripts/create-tarball.sh .PHONY: $(KABI_TARBALL) -$(KABI_TARBALL): +$(KABI_TARBALL): dist-kabi @(cd kabi && tar -cJf $(KABI_TARBALL) kabi-rhel$(RHEL_MAJOR)* kabi-current) .PHONY: $(KABIDW_TARBALL) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2892

1 0

[OS-BUILD PATCH] redhat/configs: Remove HOTPLUG_CPU0 configs
by Prarit Bhargava (via Email Bridge) 18 Jan '24

18 Jan '24

From: Prarit Bhargava <prarit(a)redhat.com> redhat/configs: Remove HOTPLUG_CPU0 configs linux commit e59e74dc48a3 ("x86/topology: Remove CPU0 hotplug option") removed the code that implements these CONFIGs. These files can be safely removed. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0 b/redhat/configs/fedora/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_HOTPLUG_CPU0 b/redhat/configs/fedora/generic/CONFIG_DEBUG_HOTPLUG_CPU0 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_DEBUG_HOTPLUG_CPU0 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set diff --git a/redhat/configs/rhel/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0 b/redhat/configs/rhel/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_BOOTPARAM_HOTPLUG_CPU0 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set diff --git a/redhat/configs/rhel/generic/x86/CONFIG_BOOTPARAM_HOTPLUG_CPU0 b/redhat/configs/rhel/generic/x86/CONFIG_BOOTPARAM_HOTPLUG_CPU0 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/x86/CONFIG_BOOTPARAM_HOTPLUG_CPU0 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_BOOTPARAM_HOTPLUG_CPU0=y diff --git a/redhat/configs/rhel/generic/x86/CONFIG_DEBUG_HOTPLUG_CPU0 b/redhat/configs/rhel/generic/x86/CONFIG_DEBUG_HOTPLUG_CPU0 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/x86/CONFIG_DEBUG_HOTPLUG_CPU0 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2891

1 0

[OS-BUILD PATCHv5] Add new os-build targets: rt-devel and automotive-devel
by Don Zickus (via Email Bridge) 17 Jan '24

17 Jan '24

From: Don Zickus <dzickus(a)redhat.com> 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 os-build-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 os-build-stable (linux-stable) to linux master again. NOTE: The script uses os-build-stable 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 os-build-stable 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. 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 @@ -19,6 +19,156 @@ ci_pre_check() git diff-index --quiet HEAD || die "Dirty tree, please clean before merging." } +# 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" + 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)" + 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() +{ + branch=$1 + upstream=$2 + base=$3 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + if ! git rebase --onto "$base" "$upstream"; then + git rebase --abort + printf "Rebase conflict; halting!\n" + printf "To reproduce:\n" + printf "* git checkout %s\n" "${branch}" + printf "* git rebase --onto %s %s\n" "${base}" "${upstream}" + die "Rebase conflicts" + fi + git checkout "$prev_branch" + return 0 +} + +ark_update_configs() +{ + branch=$1 + skip_configs=$2 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + + # Generates and commits all the pending configs + make -j FLAVOR=fedora dist-configs-commit + # Skip executing gen_config_patches.sh for new Fedora configs + + old_head="$(git rev-parse HEAD)" + make -j FLAVOR=rhel dist-configs-commit + new_head="$(git rev-parse HEAD)" + + + # Converts each new pending config from above into its finalized git + # configs/<date>/<config> branch. These commits are used for Merge + # Requests. + [ "$old_head" != "$new_head" ] && CONFIGS_ADDED="1" || CONFIGS_ADDED="" + + if test "$CONFIGS_ADDED"; then + if test -z "$skip_configs"; then + git checkout "$prev_branch" + ./redhat/scripts/genspec/gen_config_patches.sh "$branch" + fi + else + printf "No new configuration values exposed from " + printf "merging %s into $BRANCH\n" "$UPSTREAM_REF" + fi + + git checkout "$prev_branch" + test -z "$CONFIGS_ADDED" && return 0 || return 1 +} + +ark_push_changes() +{ + branch=$1 + skip_configs=$2 + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${branch}" + + TMPFILE=".push-warnings" + touch "$TMPFILE" + + test "$TO_PUSH" && PUSH_VERB="Pushing" || PUSH_VERB="To push" + PUSH_STR="branch ${branch} to ${GITLAB_URL}" + PUSH_CMD="git push gitlab ${branch}" + PUSH_CONFIG_STR="config update branches" + PUSH_CONFIG_CMD="for conf_branch in \$(git branch | grep configs/${branch}/\"\$(date +%F)\"); do + git push \\ + -o merge_request.create \\ + -o merge_request.target=\"$branch\" \\ + -o merge_request.remove_source_branch \\ + gitlab \"\$conf_branch\" 2>&1 | tee -a $TMPFILE + done + " + + #Push branch + echo "# $PUSH_VERB $PUSH_STR" + echo "$PUSH_CMD" + test "$TO_PUSH" && eval "$PUSH_CMD" + + #Push config branches if created + if test -z "$skip_configs"; then + echo + echo "# $PUSH_VERB $PUSH_CONFIG_STR" + echo "$PUSH_CONFIG_CMD" + test "$TO_PUSH" && eval "$PUSH_CONFIG_CMD" + fi + + # GitLab server side warnings do not fail git-push but leave verbose + # WARNING messages. Grep for those and consider it a script + # failure. Make sure all branches are pushed first as follow up + # git-pushes may succeed. + grep -q "remote:[ ]* WARNINGS" "$TMPFILE" && die "Server side warnings" + + rm "$TMPFILE" + git checkout "$prev_branch" + return 0 +} + # Common variables for all CI scripts UPSTREAM_REF=${1:-"master"} BRANCH=${2:-"os-build"} diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh new file mode 100755 index blahblah..blahblah 100755 --- /dev/null +++ b/redhat/scripts/ci/ark-merge-rt.sh @@ -0,0 +1,130 @@ +#!/bin/bash +# +# This script is intended to sync up the RT and automotive branch (derivative +# of RT). It adds the extra twist of detecting the right upstream rt branch +# to sync with depending on the existance of the next branch. Sometimes the +# rt-devel branch waits until -rc1/2 to create new branches. +# Finally the code handles the rebases in those cases where newer branches +# are available. +# +# Why the complexity? +# Development branches will need to be periodically rebased unfortunately. +# Using 'git rebase --onto <new head> <old_head>' only works with one common +# branch to rebase from not two. Meanwhile, the -devel branches are formed +# from two upstream branches, os-build and linux-rt-devel. The idea is +# to merge the two branches into a single throwaway branch that can be +# recreated from scratch anytime then use that as the base for -devel. + +set -e + +# source common CI functions and variables +# shellcheck disable=SC1091 +. "$(dirname "$0")"/ark-ci-env.sh + +#Upstream RT tree git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git +UPSTREAM_RT_TREE_NAME="linux-rt-devel" +DOWNSTREAM_RT_BRANCH="master-rt-devel" +RT_PREP_BRANCH="os-build-rt-automated" +RT_DEVEL_BRANCH="os-build-rt-devel" +AUTOMOTIVE_DEVEL_BRANCH="os-build-automotive-devel" + +# grab the os-build base branches +ark_git_mirror "os-build" "origin" "os-build" +ark_git_mirror "master" "origin" "master" + +# upstream -rt devel branches are aligned with version numbers and are not +# always up to date with master. Figure out which branch to mirror based on +# version number and existance. We may have to trigger a rebase. + +# what are the current versions of rt-devel and os-build (use 'master' to +# avoid fedora tagging of kernel-X.Y.0.0.....) +# use git tags which are always 'vX.Y-rcZ-aaa-gbbbbb' or 'vX.Y-aaa-gbbbbb' +# where X.Y is the version number that maps to linux-rt's branch of +# 'linux-X.Y.y' +get_upstream_version() +{ + branch=$1 + upstream="master" + + # Thanks to pre-rc1 merging, we have a 2 week window with an + # incorrect version number. Detect and correct. + mergebase="$(git merge-base "$branch" "$upstream")" + raw_version="$(git describe "$mergebase")" + version="$(git show "$branch":Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')" + patchlevel="$(git show "$branch":Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')" + kver="${version}.${patchlevel}" + + #-rc indicates no tricks necessary, return version + if echo "${raw_version}" | grep -q -- "-rc"; then + echo "$kver" + return + fi + + #if -gXXX is _not_ there, must be a GA release, use version + if ! echo "${raw_version}" | grep -q -- "-g"; then + echo "$kver" + return + fi + + #must be a post tag release with -g but not -rcX, IOW an rc0. + #Add a 1 to the version number + echo "${version}.$((patchlevel + 1))" +} + +RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")" +RT_PREP_VER="$(get_upstream_version $RT_PREP_BRANCH)" +OS_BUILD_VER="$(get_upstream_version os-build)" + +# Grab possible rt branches to choose from +RT_FETCH_BRANCH="linux-${RT_DEVEL_VER}.y-rt" +RT_REBASE_FETCH_BRANCH="linux-${OS_BUILD_VER}.y-rt" +RT_MERGE_BRANCH="$RT_FETCH_BRANCH" +OS_BUILD_BASE_BRANCH="os-build" + +if test "$RT_DEVEL_VER" != "$OS_BUILD_VER"; then + # does the newer version branch exist in linux-rt-devel yet? + if ! git fetch "$UPSTREAM_RT_TREE_NAME" "$RT_REBASE_FETCH_BRANCH"; then + # no newer upstream branch to rebase onto, continue with linux-stable branch + OS_BUILD_BASE_BRANCH="os-build-stable" + RT_REBASE="" + else + # rebase time + RT_MERGE_BRANCH="$RT_REBASE_FETCH_BRANCH" + RT_REBASE="yes" + fi +fi + +# sanity check, sometimes broken scripts leave a mess +if test "$RT_DEVEL_VER" != "$RT_PREP_VER"; then + RT_REBASE="yes" +fi + +## PREP the upstream branches +# on a rebase, propogate all the git resets +# fetch the determined rt-devel branch +ark_git_mirror "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME" "$RT_MERGE_BRANCH" "$RT_REBASE" +# finally merge the two correct branches +old_RT_PREP_BRANCH="$(git rev-parse $RT_PREP_BRANCH)" # for ark_git_rebase +ark_git_merge "$OS_BUILD_BASE_BRANCH" "$RT_PREP_BRANCH" "$RT_REBASE" +ark_git_merge "$DOWNSTREAM_RT_BRANCH" "$RT_PREP_BRANCH" + +## MERGE the upstream branches to the development branches +if test -n "$RT_REBASE"; then + # handle the rebase + ark_git_rebase "$RT_DEVEL_BRANCH" "$old_RT_PREP_BRANCH" "$RT_PREP_BRANCH" + ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$old_RT_PREP_BRANCH" "$RT_PREP_BRANCH" +fi + +## Build -rt-devel branch, generate pending-rhel configs +ark_git_merge "$RT_PREP_BRANCH" "$RT_DEVEL_BRANCH" +# don't care if configs were added or not hence '|| true' +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 "$RT_PREP_BRANCH" "$AUTOMOTIVE_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 +ark_push_changes "$AUTOMOTIVE_DEVEL_BRANCH" "skip" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2732

1 1

[OS-BUILD PATCHv4 0/2] spec: use jsut-built bpftool for vmlinux.h generation
by Artem Savkov (via Email Bridge) 17 Jan '24

17 Jan '24

From: Artem Savkov on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2884 Forwardport from rhel9. Bugzilla: http://bugzilla.redhat.com/2120968 Upstream status: RHEL-only With the latest toolchain update build fails due to libbpf missing btf enum64 support. 5.19 update contains libbpf update but the spec uses buildroot's (old) bpftool. Switch to use the just-built bpftool. The snippet cannot be moved below bpftool build since vmlinux.h is needed to build_tools. Credits to Felix Maurer <fmaurer(a)redhat.com> Signed-off-by: Yauheni Kaliuta <ykaliuta(a)redhat.com> --- redhat/kernel.spec.template | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)

1 2

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel January 2024