Re: [OS-BUILD PATCH] Remove unused ci scripts
From: John B. Wyatt IV on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2091#note_1132063373 @prarit should you be part of the RedHat group for kernel-ark? Approving. ___ 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] Add kasan_test to mod-internal.list
From: Justin M. Forbes Add kasan_test to mod-internal.list Another new kunit test that fails depmod until it is added to mod-internal.list. Signed-off-by: Justin M. Forbes diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list index blahblah..blahblah 100644 --- a/redhat/mod-internal.list +++ b/redhat/mod-internal.list @@ -21,6 +21,7 @@ fat_test fortify_kunit iio-test-format iio-test-rescale +kasan_test kfence_test kunit kunit-test -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2092 ___ 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] Remove unused ci scripts
From: Don Zickus
Remove unused ci scripts
The ARK CI process has changed over time and the following scripts are
no longer used. Remove them to avoid confusion for future contributors.
* ark-rebase-patches.sh
used to rebase patches for ark-patches. ark-patches was replaced by
the current merge based workflow.
* ark-update-changelog.sh
a legacy implementation to update the changelog on os-build from
ark-latest when ark-patches was being used. This has been replaced by
the current merge based workflow.
* sign_off_check.py
used by ci scripts to verify every MR had a signed-off-by line.
Replaced with kernel-webhooks implementation of the same idea.
Signed-off-by: Don Zickus
diff --git a/redhat/scripts/ci/ark-rebase-patches.sh
b/redhat/scripts/ci/ark-rebase-patches.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/scripts/ci/ark-rebase-patches.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/bash
-#
-# Automatically rebase the kernel patches in ark-patches.
-#
-# If the REPORT_BUGS environment variable is set, any patches that do not apply
-# cleanly during the rebase are dropped, and an issue is filed to track
rebasing
-# that patch.
-#
-# If run with REPORT_BUGS, you must have python3-gitlab installed and a
-# configuration file set up in ~/.python-gitlab.cfg or /etc/python-gitlab.cfg.
-# An example configuration can be found at
-# https://python-gitlab.readthedocs.io/en/stable/cli.html. If the configuration
-# is not in one of the above locations, the path can be set
-# with the PYTHON_GITLAB_CONFIG environment variable.
-#
-# Arguments:
-# 1) The commit/tag/branch to rebase onto.
-# 2) The Gitlab project ID to file issues against. See the project page on
-# Gitlab for the ID. For example,
https://gitlab.com/cki-project/kernel-ark/
-# is project ID 13604247
-set -e
-
-UPSTREAM_REF=${1:-master}
-test -n "$PROJECT_ID" || PROJECT_ID="${2:-13604247}"
-
-ISSUE_TEMPLATE="During an automated rebase of ark-patches, commit %s failed to
rebase.
-
-The commit in question is:
-~~~
-%s
-~~~
-
-To fix this issue:
-
-1. \`git rebase upstream ark-patches\`
-2. Use your soft, squishy brain to resolve the conflict as you see fit. If it
is
- non-trivial and has an \"Upstream Status: RHEL only\" tag, ask the author
- to rebase the patch.
-3. \`if git tag -v $UPSTREAM_REF; then git branch ark/patches/$UPSTREAM_REF &&
git push upstream ark/patches/$UPSTREAM_REF; fi\`
-4. \`git push -f upstream ark-patches\`
-"
-
-if [ -z "$PYTHON_GITLAB_CONFIG" ]; then
- GITLAB_CONFIG_OPT=""
-else
- GITLAB_CONFIG_OPT="-c $PYTHON_GITLAB_CONFIG"
-fi
-
-# Check if ark-patches is already rebased to $UPSTREAM_REF
-test -n "$(git branch os-build --contains "$UPSTREAM_REF")" && exit 0
-
-if git show "$UPSTREAM_REF" > /dev/null 2>&1; then
- printf "Rebasing ark-patches onto %s...\n" "$UPSTREAM_REF"
-else
- printf "No such git object \"%s\" in tree\n" "$UPSTREAM_REF"
- exit 1
-fi
-
-if [ -n "$PROJECT_ID" ] && [ "$PROJECT_ID" -eq "$PROJECT_ID" ] 2> /dev/null;
then
- printf "Filing issues against GitLab project ID %s\n" "$PROJECT_ID"
-else
- printf "No Gitlab project ID specified; halting!\n"
- exit 1
-fi
-
-CLEAN_REBASE=true
-if git rebase "$UPSTREAM_REF" ark-patches; then
- printf "Cleanly rebased all patches\n"
-elif [ -n "$REPORT_BUGS" ]; then
- while true; do
- CLEAN_REBASE=false
- CONFLICT=$(git am --show-current-patch)
- COMMIT=$(git am --show-current-patch | head -n1 | awk '{print
$2}' | cut -c 1-12)
- TITLE=$(printf "Unable to automatically rebase commit %s"
"$COMMIT")
- # shellcheck disable=SC2059 # There is a multi-line pattern
in ISSUE_TEMPLATE;
- # wiki says there is no good rewrite and recommends disabling
warning.
- DESC=$(printf "$ISSUE_TEMPLATE" "$COMMIT" "$CONFLICT")
- # shellcheck disable=SC2086
- # GITLAB_CONFIG_OPT DEPENDS on word splitting:
- OPEN_ISSUES=$(gitlab $GITLAB_CONFIG_OPT project-issue list
--project-id "$PROJECT_ID" --search "$TITLE")
- if [ -n "$OPEN_ISSUES" ]; then
- echo "Skipping filing an issue about commit $COMMIT;
already exists as $OPEN_ISSUES"
- continue
- fi
-
- # shellcheck disable=SC2086
- # GITLAB_CONFIG_OPT DEPENDS on word splitting:
- if gitlab $GITLAB_CONFIG_OPT project-issue create --project-id
"$PROJECT_ID" \
- --title "$TITLE" --description "$DESC" --labels "Patch
Rebase"; then
- if git rebase --skip; then
- printf "Finished dropping patches that fail to
rebase\n"
- break
- else
- continue
- fi
- else
- printf
[OS-BUILD PATCH] Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in configs
From: Justin M. Forbes Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in configs Upstream commit 0192445cb2f7e renamed FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER which made it appear as a new config item for us in pending. While I have fixed up pending, this MR just fixes up the proper config locations. All values for ARCH_FORCE_MAX_ORDER match the values for FORCE_MAX_ZONEORDER which were valid before this MR. It is a simple rename with no functional change to the config. Signed-off-by: Justin M. Forbes diff --git a/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER rename from redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER index blahblah..blahblah 100644 --- a/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER +++ /dev/null @@ -1,3 +0,0 @@ -# This relies on an out of tree patch to arch/arm64/Kconfig -# Otherwise, we would be stuck with a default of 11 -CONFIG_FORCE_MAX_ZONEORDER=13 diff --git a/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER rename from redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER rename to redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER index blahblah..blahblah 100644 --- a/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER +++ b/redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER diff --git a/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER +++ /dev/null @@ -1 +0,0 @@ -CONFIG_FORCE_MAX_ZONEORDER=9 diff --git a/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ARCH_FORCE_MAX_ORDER=13 diff --git a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ARCH_FORCE_MAX_ORDER=9 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2090 ___ 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 PATCHv2] redhat: Remove parallel_xz.sh
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2068#note_1131692752 Fixed. ___ 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 PATCHv2] redhat: Remove parallel_xz.sh
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2068#note_1131692324 Oops. Of course. Fixed. ___ 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 PATCHv2] redhat: Remove parallel_xz.sh
From: Prarit Bhargava
redhat: Remove parallel_xz.sh
The parallel_xz.sh script is no longer used. It is defined as Source22 but is
never
called. The script was removed from execution in ark commit
e60c3381ad10 ("Temporarily backout parallel xz script") and never put back into
execution.
A quick test doesn't show a benefit of using parallel_xz.sh so it can be safely
removed.
Remove the unused parallel_xz.sh script.
Additional fix: The comment line is a remnant of configuring -j for
parallel_xz.sh and can also be removed.
Signed-off-by: Prarit Bhargava
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -640,7 +640,6 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source
dist-configs-check
configs/generate_all_configs.sh \
configs/merge.pl \
configs/process_configs.sh \
- parallel_xz.sh \
../Makefile.rhelver \
README.rst \
kernel-local \
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -90,7 +90,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
-# for parallel xz processes, replace with 1 to go back to single process
%endif
%if 0%{?fedora}
@@ -760,7 +759,6 @@ Source13: redhatsecureboot003.cer
Source20: mod-denylist.sh
Source21: mod-sign.sh
-Source22: parallel_xz.sh
%define modsign_cmd %{SOURCE21}
diff --git a/redhat/parallel_xz.sh b/redhat/parallel_xz.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/parallel_xz.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Reads filenames on stdin, xz-compresses each in place.
-# Not optimal for "compress relatively few, large files" scenario!
-
-# How many xz's to run in parallel:
-procgroup=""
-while test "$#" != 0; do
- # Get it from -jNUM
- N="${1#-j}"
- if test "$N" = "$1"; then
- # Not -j - warn and ignore
- echo "parallel_xz: warning: unrecognized argument: '$1'"
- else
- procgroup="$N"
- fi
- shift
-done
-
-# If told to use only one cpu:
-test "$procgroup" || exec xargs -r xz
-test "$procgroup" = 1 && exec xargs -r xz
-
-# xz has some startup cost. If files are really small,
-# this cost might be significant. To combat this,
-# process several files (in sequence) by each xz process via -n 16:
-exec xargs -r -n 16 -P "$procgroup" xz
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2068
___
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
