kernel January 2024

kernel@lists.fedoraproject.org

5 participants
85 discussions

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

29 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 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 <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 @@ -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 <url>" - echo "git remote set-url --push gitlab <pushurl>" + 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>" + 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" + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${rebase_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" "${rebase_branch}" + printf "* git rebase --onto %s %s\n" "${_base}" "${_upstream}" + die "Rebase conflicts" + fi + git checkout "$prev_branch" + return 0 +} + +ark_update_configs() +{ + config_branch="$1" + skip_configs="$2" + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${config_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> 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 "$config_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() +{ + push_branch="$1" + skip_configs="$2" + + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + git checkout "${push_branch}" + + TMPFILE=".push-warnings" + touch "$TMPFILE" + + test "$TO_PUSH" && PUSH_VERB="Pushing" || PUSH_VERB="To push" + PUSH_STR="branch ${push_branch} to ${GITLAB_URL}" + PUSH_CMD="git push gitlab ${push_branch}" + PUSH_CONFIG_STR="config update branches" + PUSH_CONFIG_CMD="for conf_branch in \$(git branch | grep configs/${push_branch}/\"\$(date +%F)\"); do + git push \\ + -o merge_request.create \\ + -o merge_request.target=\"$push_branch\" \\ + -o merge_request.remove_source_branch \\ + gitlab \"\$conf_branch\" 2>&1 | tee -a $TMPFILE + done + " + + #Push 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 push_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"} PROJECT_ID=${PROJECT_ID:-"13604247"} TO_PUSH=${DIST_PUSH:-""} -GITLAB_PROJECT_URL="$(git remote get-url gitlab 2>/dev/null)" -GITLAB_PROJECT_PUSHURL="$(git config --get remote.gitlab.pushurl 2>/dev/null)" +GITLAB_PROJECT_URL="$(git remote get-url gitlab 2>/dev/null)" || true +GITLAB_PROJECT_PUSHURL="$(git config --get remote.gitlab.pushurl 2>/dev/null)" || true ci_pre_check 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,173 @@ +#!/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_URL="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_AUTOMATED_BRANCH="os-build-rt-automated" +RT_DEVEL_BRANCH="os-build-rt-devel" +AUTOMOTIVE_DEVEL_BRANCH="os-build-automotive-devel" + +# verify git remote rt is setup +if ! git remote get-url "$UPSTREAM_RT_TREE_NAME" 2>/dev/null; then + die "Please 'git remote add linux-rt-devel $UPSTREAM_RT_TREE_URL'" +fi + +# grab the os-build base branches +ark_git_mirror "os-build" "origin" "os-build" +ark_git_mirror "master" "origin" "master" + +# make sure tags are available for git-describe to correctly work +git fetch -t origin + +# 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))" +} + +# To handle missing branches, precalculate previous kernel versions to fetch +get_prev_version() +{ + version_str=$1 + + version="$(echo "$version_str" | cut -c1)" + patchlevel="$(echo "$version_str" | cut -c3)" + + echo "${version}.$((patchlevel - 1))" +} + +OS_BUILD_VER="$(get_upstream_version os-build)" +OS_BUILD_VER_prev="$(get_prev_version "$OS_BUILD_VER")" + +# check latest upstream RT branch +if git fetch -q "$UPSTREAM_RT_TREE_NAME" "linux-${OS_BUILD_VER}.y-rt"; then + UPSTREAM_RT_DEVEL_VER="${OS_BUILD_VER}" +elif git fetch -q "$UPSTREAM_RT_TREE_NAME" "linux-${OS_BUILD_VER_prev}.y-rt"; then + UPSTREAM_RT_DEVEL_VER="${OS_BUILD_VER_prev}" +else + die "Neither version ($OS_BUILD_VER, $OS_BUILD_VER_prev) in upstream tree: $UPSTREAM_RT_TREE_NAME" +fi + +# verify the core branches exist or use provided defaults +UPSTREAM_RT_DEVEL_BRANCH="linux-${UPSTREAM_RT_DEVEL_VER}.y-rt" +ark_git_branch "$DOWNSTREAM_RT_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" +ark_git_branch "$RT_AUTOMATED_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" +ark_git_branch "$RT_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" +ark_git_branch "$AUTOMOTIVE_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH" + +MASTER_RT_DEVEL_VER="$(get_upstream_version "$DOWNSTREAM_RT_BRANCH")" +RT_AUTOMATED_VER="$(get_upstream_version $RT_AUTOMATED_BRANCH)" +RT_DEVEL_VER="$(get_upstream_version $RT_DEVEL_BRANCH)" +AUTOMOTIVE_DEVEL_VER="$(get_upstream_version $AUTOMOTIVE_DEVEL_BRANCH)" + +OS_BUILD_BASE_BRANCH="os-build" +RT_REBASE="" + +if test "$UPSTREAM_RT_DEVEL_VER" != "$OS_BUILD_VER"; then + # no newer upstream branch to rebase onto, continue with an + # os-build stable tag + OS_BUILD_BASE_BRANCH="kernel-${MASTER_RT_DEVEL_VER}.0-0" +fi + +# sanity check, sometimes broken scripts leave a mess +if test "$MASTER_RT_DEVEL_VER" != "$UPSTREAM_RT_DEVEL_VER" -o \ + "$MASTER_RT_DEVEL_VER" != "$RT_AUTOMATED_VER" -o \ + "$MASTER_RT_DEVEL_VER" != "$RT_DEVEL_VER" -o \ + "$MASTER_RT_DEVEL_VER" != "$AUTOMOTIVE_DEVEL_VER"; then + # rebase time + 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" "$UPSTREAM_RT_DEVEL_BRANCH" "$RT_REBASE" +# finally merge the two correct branches +ark_git_merge "$OS_BUILD_BASE_BRANCH" "$RT_AUTOMATED_BRANCH" "$RT_REBASE" +ark_git_merge "$DOWNSTREAM_RT_BRANCH" "$RT_AUTOMATED_BRANCH" + +## MERGE the upstream branches to the development branches +if test -n "$RT_REBASE"; then + # handle the rebase + # rebases usually go from prev version to new version + # rebuild the prev merge base in case the previous automated one is + # corrupted. + prev_branch="$(git rev-parse --abbrev-ref HEAD)" + temp_branch="_temp_rt_devel_$(date +%F)" + git branch -D "$temp_branch" 2>/dev/null + git checkout -b "$temp_branch" "kernel-${OS_BUILD_VER_prev}.0-0" + git merge "$UPSTREAM_RT_TREE_NAME/linux-${OS_BUILD_VER_prev}.y-rt" + git checkout "$prev_branch" + ark_git_rebase "$RT_DEVEL_BRANCH" "$temp_branch" "$RT_AUTOMATED_BRANCH" + ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$temp_branch" "$RT_AUTOMATED_BRANCH" + git branch -D "$temp_branch" +fi + +## Build -rt-devel branch, generate pending-rhel configs +ark_git_merge "$RT_AUTOMATED_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_AUTOMATED_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

2 3

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

28 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: 112403029 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/125969 Tests that were not ran because of internal issues: x86_64 - CKI/restraint x86_64 - SELinux Custom Module Setup x86_64 - machineinfo x86_64 - Boot test x86_64 - Hardware - CPU: Die Test x86_64 - Hardware - IPMI driver test x86_64 - Hardware - IPMItool loop stress test x86_64 - Storage - swraid scsi_raid x86_64 - stress: stress-ng - interrupt x86_64 - stress: stress-ng - cpu x86_64 - stress: stress-ng - cpu-cache x86_64 - stress: stress-ng - memory x86_64 - 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

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

28 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: 112419587 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/126077 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 PATCHv9 0/2] Add new os-build targets: rt-devel and automotive-devel
by Don Zickus (via Email Bridge) 27 Jan '24

27 Jan '24

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 | 178 ++++++++++++++++++++++++++++++++++++- redhat/scripts/ci/ark-merge-rt.sh | 173 ++++++++++++++++++++++++++++++++++++ redhat/kernel.spec.template | 2 +- 3 files changed, 345 insertions(+), 8 deletions(-)

1 3

Kernel 6.7 Test Week is underway!
by Sumantro Mukherjee 27 Jan '24

27 Jan '24

Hey Folks, As most of you might know, Kernel 6.7 Test Week is currently happening[0] I have figured out that, I can't login to FAS from the Kernel Test Result site[1]. If you are also someone who is stuck, please follow the infra issue filed here[2]. And please submit the results here[3] If you have still not participated and have some free time, we urge you to take part in testing! We are also sorry for the inconvenience caused due to login issues. Thanks for testing :) [0] http://fedoraproject.org/wiki/Test_Day:2024-01-21_Kernel_6.7_Test_Week [1] https://apps.fedoraproject.org/kerneltest/ [2] https://pagure.io/fedora-infrastructure/issue/11744 [3] https://testdays.fedoraproject.org/events/173 -- //sumantro Fedora QE TRIED AND PERSONALLY TESTED, ERGO TRUSTED

2 1

[OS-BUILD PATCHv8 0/2] Add new os-build targets: rt-devel and automotive-devel
by Don Zickus (via Email Bridge) 26 Jan '24

26 Jan '24

1 3

[OS-BUILD PATCHv8 0/3] redhat/Makefile: fix and clean up some of the logic
by Ondrej Mosnáček (via Email Bridge) 26 Jan '24

26 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/self-test/data/centos-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/create-data.sh | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 4 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 4 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7 | 4 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 4 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 ++-- redhat/Makefile | 26 +++++++++++++------------- 26 files changed, 62 insertions(+), 62 deletions(-)

4 11

[OS-BUILD PATCHv2 0/4] redhat/Makefile: fix and clean up some of the logic (v2)
by Ondrej Mosnáček (via Email Bridge) 26 Jan '24

26 Jan '24

From: Ondrej Mosnáček on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2913 Since !2892 was buggy and had to be reverted, this is a second attempt, hopefully correct this time. --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 +- redhat/self-test/data/create-data.sh | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 +- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 4 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 +- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 4 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 +- redhat/self-test/data/rhel-df0cc57e057f.el7 | 4 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 +- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 4 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 +- redhat/Makefile | 38 +++++++++++-------------- 26 files changed, 66 insertions(+), 70 deletions(-)

1 4

[OS-BUILD PATCH 0/4] redhat/Makefile: fix and clean up some of the logic (v2)
by Ondrej Mosnáček (via Email Bridge) 26 Jan '24

26 Jan '24

1 0

[OS-BUILD PATCH] Add scaffolding to build the kernel-headers package for Fedora
by Justin M. Forbes (via Email Bridge) 24 Jan '24

24 Jan '24

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Add scaffolding to build the kernel-headers package for Fedora For years, the scripts to build the kernel headers package have been sitting on maintainers desktops. Let's get those into kernel-ark. I have been using these to create the Fedora kernel-headers dist-git for a while now. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -845,6 +845,22 @@ ifeq ("$(RHDISTGIT_BRANCH)", "") endif $(REDHAT)/scripts/rh-dist-git.sh +dist-headers-srpm: + @scripts/create_headers_tarball.sh + @cp $(REDHAT)/kernel-headers.spec.template $(SOURCES)/kernel-headers.spec + @$(REDHAT)/scripts/genspec/headerspec.sh + @cp $(SOURCES)/kernel-headers.spec $(SOURCES)/../SPECS/ + $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --nodeps -bs $(RPM)/SOURCES/kernel-headers.spec + +dist-git-headers: dist-headers-srpm +ifeq ("$(RHDISTGIT_BRANCH)", "") + $(error RHDISTGIT_BRANCH unset) +endif + SPECPACKAGE_NAME=kernel-headers SRPM=$(SRPMS)/kernel-headers-$(BASEVERSION)$(DIST).src.rpm $(REDHAT)/scripts/rh-headers-dist-git.sh + +dist-git-headers-test: export RH_DIST_GIT_TEST="1" +dist-git-headers-test: dist-git-headers + dist-rtg: dist-release @$(MAKE) dist-release-tag @$(MAKE) dist-git diff --git a/redhat/kernel-headers.spec.template b/redhat/kernel-headers.spec.template new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/kernel-headers.spec.template @@ -0,0 +1,112 @@ +# For a stable, released kernel, released_kernel should be 1. For rawhide +# and/or a kernel built from an rc or git snapshot, released_kernel should +# be 0. +%global released_kernel %%SPECRELEASED_KERNEL%% + +%%SPECBUILDID%% +%define specversion %%SPECVERSION%% +%define tarfile_release %%SPECTARFILE_RELEASE%% +# This is needed to do merge window version magic +# This allows pkg_release to have configurable %%{?dist} tag +%define specrelease %%SPECRELEASE%% + +# This package doesn't contain any binary, thus no debuginfo package is needed +%global debug_package %{nil} + +Name: kernel-headers +Summary: Header files for the Linux kernel for use by glibc +License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-3-Clause AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only WITH Linux-syscall-note) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND (LGPL-2.1-only WITH Linux-syscall-note) AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND MIT +URL: http://www.kernel.org/ +Version: %{specversion} +Release: %{specrelease} +# This is a tarball with headers from the kernel, which should be created +# using create_headers_tarball.sh provided in the kernel source package. +# To create the tarball, you should go into a prepared/patched kernel sources +# directory, or git kernel source repository, and do eg.: +# For a RHEL package: (...)/create_headers_tarball.sh -m RHEL_RELEASE +# For a Fedora package: kernel/scripts/create_headers_tarball.sh -r <release number> +Source0: kernel-headers-%{tarfile_release}.tar.xz +Obsoletes: glibc-kernheaders < 3.0-46 +Provides: glibc-kernheaders = 3.0-46 +%if "0%{?variant}" +Obsoletes: kernel-headers < %{specversion}-%{specrelease} +Provides: kernel-headers = %{specversion}-%{specrelease} +%endif + +%description +Kernel-headers includes the C header files that specify the interface +between the Linux kernel and userspace libraries and programs. The +header files define structures and constants that are needed for +building most standard programs and are also needed for rebuilding the +glibc package. + +%package -n kernel-cross-headers +Summary: Header files for the Linux kernel for use by cross-glibc + +%description -n kernel-cross-headers +Kernel-cross-headers includes the C header files that specify the interface +between the Linux kernel and userspace libraries and programs. The +header files define structures and constants that are needed for +building most standard programs and are also needed for rebuilding the +cross-glibc package. + +%prep +%setup -q -c + +%build + +%install +# List of architectures we support and want to copy their headers +ARCH_LIST="arm arm64 powerpc riscv s390 x86" + +ARCH=%_target_cpu +case $ARCH in + armv7hl) + ARCH=arm + ;; + aarch64) + ARCH=arm64 + ;; + ppc64*) + ARCH=powerpc + ;; + riscv64) + ARCH=riscv + ;; + s390x) + ARCH=s390 + ;; + x86_64|i*86) + ARCH=x86 + ;; +esac + +cd arch-$ARCH/include +mkdir -p $RPM_BUILD_ROOT%{_includedir} +cp -a asm-generic $RPM_BUILD_ROOT%{_includedir} + +# Copy all the architectures we care about to their respective asm directories +for arch in $ARCH_LIST; do + mkdir -p $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/include + cp -a asm-generic $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/include/ +done + +# Remove what we copied already +rm -rf asm-generic + +# Copy the rest of the headers over +cp -a * $RPM_BUILD_ROOT%{_includedir}/ +for arch in $ARCH_LIST; do +cp -a * $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/include/ +done + +%files +%defattr(-,root,root) +%{_includedir}/* + +%files -n kernel-cross-headers +%defattr(-,root,root) +%{_prefix}/*-linux-gnu/* + +%changelog +%autochangelog diff --git a/redhat/scripts/create_headers_tarball.sh b/redhat/scripts/create_headers_tarball.sh new file mode 100755 index blahblah..blahblah 100755 --- /dev/null +++ b/redhat/scripts/create_headers_tarball.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# shellcheck disable=SC2035 +# shellcheck disable=SC2038 +# shellcheck disable=SC3044 +# This script is aimed at generating the headers from the kernel sources. + +set -e + +# ARCH_LIST below has the default list of supported architectures +# (the architectures names may be different from rpm, you list here the +# names of arch/<arch> directories in the kernel sources) +ARCH_LIST="arm arm64 powerpc riscv s390 x86" + +headers_dir=$(mktemp -d) +trap 'rm -rf "$headers_dir"' SIGHUP SIGINT SIGTERM EXIT + +archs=${ARCH_LIST:-$(ls arch)} + +# Upstream rmeoved the headers_install_all target so do it manually +for arch in $archs; do + cd "$TOPDIR" + mkdir "$headers_dir/arch-$arch" + make ARCH="$arch" INSTALL_HDR_PATH="$headers_dir/arch-$arch" KBUILD_HEADERS=install headers_install +done +find "$headers_dir" \ + $ -name .install -o -name .check -o \ + -name ..install.cmd -o -name ..check.cmd $ | xargs rm -f + +TARBALL="$SOURCES/kernel-headers-$UPSTREAM_TARBALL_NAME.tar.xz" +pushd "$headers_dir" + tar -Jcf "$TARBALL" * +popd + +echo wrote "$TARBALL" diff --git a/redhat/scripts/genspec/headerspec.sh b/redhat/scripts/genspec/headerspec.sh new file mode 100755 index blahblah..blahblah 100755 --- /dev/null +++ b/redhat/scripts/genspec/headerspec.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# shellcheck disable=SC2153 + +if [ -n "$DISTLOCALVERSION" ]; then + SPECBUILDID=$(printf "%%define buildid %s" "$DISTLOCALVERSION") +else + SPECBUILDID="# define buildid .local" +fi + +# The SPECRELEASE variable uses the SPECBUILDID variable which is +# defined above. IOW, don't remove SPECBUILDID ;) +SPECRELEASE="${UPSTREAMBUILD}""${BUILD}""%{?buildid}%{?dist}" + +# self-test begin +test -f "$SOURCES/kernel-headers.spec" && + sed -i -e " + s/%%SPECBUILDID%%/$SPECBUILDID/ + s/%%SPECKVERSION%%/$SPECKVERSION/ + s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/ + s/%%SPECBUILD%%/$SPECBUILD/ + s/%%SPECRELEASE%%/$SPECRELEASE/ + s/%%SPECRELEASED_KERNEL%%/$SPECRELEASED_KERNEL/ + s/%%SPECINCLUDE_FEDORA_FILES%%/$SPECINCLUDE_FEDORA_FILES/ + s/%%SPECINCLUDE_RHEL_FILES%%/$SPECINCLUDE_RHEL_FILES/ + s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/ + s/%%SPECINCLUDE_RT_FILES%%/$SPECINCLUDE_RT_FILES/ + s/%%SPECVERSION%%/$SPECVERSION/ + s/%%SPECRPMVERSION%%/$SPECRPMVERSION/ + s/%%SPECKABIVERSION%%/$SPECKABIVERSION/ + s/%%SPECBPFTOOLVERSION%%/$SPECBPFTOOLVERSION/ + s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/ + s/%%SPECPACKAGE_NAME%%/$SPECPACKAGE_NAME/ + s/%%SPECGEMINI%%/$SPECGEMINI/ + s/%%SPECSELFTESTS_MUST_BUILD%%/$SPECSELFTESTS_MUST_BUILD/" "$SOURCES/kernel-headers.spec" +# self-test end diff --git a/redhat/scripts/rh-headers-dist-git.sh b/redhat/scripts/rh-headers-dist-git.sh new file mode 100755 index blahblah..blahblah 100755 --- /dev/null +++ b/redhat/scripts/rh-headers-dist-git.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +# clones and updates a dist-git repo + +# shellcheck disable=SC2164 + +function die +{ + echo "Error: $1" >&2; + exit 1; +} + +function upload() +{ + [ -n "$RH_DIST_GIT_TEST" ] && return + $RHPKG_BIN new-sources "$@" >/dev/null || die "uploading $*"; +} + +if [ -z "$RHDISTGIT_BRANCH" ]; then + echo "$0: RHDISTGIT_BRANCH is not set" >&2 + exit 1 +fi + +echo "Cloning the repository" +# clone the dist-git, considering cache +date=$(date +"%Y-%m-%d") +tmpdir="$(mktemp -d --tmpdir="$RHDISTGIT_TMP" RHEL"$RHEL_MAJOR"."$date".XXXXXXXX)" +cd "$tmpdir" || die "Unable to create temporary directory"; +echo "Cloning using $RHPKG_BIN" >&2; +# shellcheck disable=SC2086 +eval $RHPKG_BIN clone "kernel-headers" >/dev/null || die "Unable to clone using $RHPKG_BIN"; + +echo "Switching the branch" +# change in the correct branch +cd "$tmpdir/kernel-headers"; +$RHPKG_BIN switch-branch "$RHDISTGIT_BRANCH" || die "switching to branch $RHDISTGIT_BRANCH"; + +echo "Unpacking from SRPM" +"$REDHAT"/scripts/expand_srpm.sh "$tmpdir" +git reset HEAD -- README.md +git checkout README.md +git add README.md + +# upload tarballs +upload_list="kernel-headers-$UPSTREAM_TARBALL_NAME.tar.xz" + +echo "Uploading new tarballs: $upload_list" +# We depend on word splitting here: +# shellcheck disable=SC2086 +upload $upload_list + +echo "Creating diff for review ($tmpdir/diff) and changelog" +# diff the result (redhat/git/dontdiff). note: diff reuturns 1 if +# differences were found +diff -X "$REDHAT"/git/dontdiff -upr "$tmpdir/kernel-headers" "$REDHAT"/rpm/SOURCES/ > "$tmpdir"/diff; + +# all done +echo "$tmpdir" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2910

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel January 2024