From: Patrick Talbert <[email protected]> [redhat] Update scripts to put new configs under ark-common
The current automated workflow creates new kernel config items in a pending-common/generic directory and produces an MR which proposes moving them to common/generic. These are config settings for ARK so really we should use a pending-ark directory and propose moving them to the ark/generic directory. Update the relevant scripts and documentation to take care of this. Signed-off-by: Patrick Talbert <[email protected]> diff --git a/redhat/configs/pending-common/debug/arm/aarch64/README b/redhat/configs/pending-ark/debug/arm/aarch64/README rename from redhat/configs/pending-common/debug/arm/aarch64/README rename to redhat/configs/pending-ark/debug/arm/aarch64/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/debug/arm/aarch64/README +++ b/redhat/configs/pending-ark/debug/arm/aarch64/README diff --git a/redhat/configs/pending-common/debug/powerpc/README b/redhat/configs/pending-ark/debug/powerpc/README rename from redhat/configs/pending-common/debug/powerpc/README rename to redhat/configs/pending-ark/debug/powerpc/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/debug/powerpc/README +++ b/redhat/configs/pending-ark/debug/powerpc/README diff --git a/redhat/configs/pending-common/debug/s390x/README b/redhat/configs/pending-ark/debug/s390x/README rename from redhat/configs/pending-common/debug/s390x/README rename to redhat/configs/pending-ark/debug/s390x/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/debug/s390x/README +++ b/redhat/configs/pending-ark/debug/s390x/README diff --git a/redhat/configs/pending-common/debug/x86/x86_64/README b/redhat/configs/pending-ark/debug/x86/x86_64/README rename from redhat/configs/pending-common/debug/x86/x86_64/README rename to redhat/configs/pending-ark/debug/x86/x86_64/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/debug/x86/x86_64/README +++ b/redhat/configs/pending-ark/debug/x86/x86_64/README diff --git a/redhat/configs/pending-common/generic/arm/aarch64/README b/redhat/configs/pending-ark/generic/arm/aarch64/README rename from redhat/configs/pending-common/generic/arm/aarch64/README rename to redhat/configs/pending-ark/generic/arm/aarch64/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/generic/arm/aarch64/README +++ b/redhat/configs/pending-ark/generic/arm/aarch64/README diff --git a/redhat/configs/pending-common/generic/powerpc/README b/redhat/configs/pending-ark/generic/powerpc/README rename from redhat/configs/pending-common/generic/powerpc/README rename to redhat/configs/pending-ark/generic/powerpc/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/generic/powerpc/README +++ b/redhat/configs/pending-ark/generic/powerpc/README diff --git a/redhat/configs/pending-common/generic/s390x/README b/redhat/configs/pending-ark/generic/s390x/README rename from redhat/configs/pending-common/generic/s390x/README rename to redhat/configs/pending-ark/generic/s390x/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/generic/s390x/README +++ b/redhat/configs/pending-ark/generic/s390x/README diff --git a/redhat/configs/pending-common/generic/x86/x86_64/README b/redhat/configs/pending-ark/generic/x86/x86_64/README rename from redhat/configs/pending-common/generic/x86/x86_64/README rename to redhat/configs/pending-ark/generic/x86/x86_64/README index blahblah..blahblah 100644 --- a/redhat/configs/pending-common/generic/x86/x86_64/README +++ b/redhat/configs/pending-ark/generic/x86/x86_64/README diff --git a/redhat/configs/priority.fedora b/redhat/configs/priority.fedora index blahblah..blahblah 100644 --- a/redhat/configs/priority.fedora +++ b/redhat/configs/priority.fedora @@ -16,7 +16,7 @@ # kernel.config files are build on the fly based on this config, # the first arg is arch and variant, the second is a hierarchy of # config options, lowest priority to highest -ORDER=common pending-common fedora pending-fedora custom-overrides +ORDER=common fedora pending-fedora custom-overrides EMPTY=s390x-zfcpdump # x86_64 diff --git a/redhat/configs/priority.rhel b/redhat/configs/priority.rhel index blahblah..blahblah 100644 --- a/redhat/configs/priority.rhel +++ b/redhat/configs/priority.rhel @@ -16,7 +16,7 @@ # kernel.config files are build on the fly based on this config, # the first arg is arch and variant, the second is a hierarchy of # config options, lowest priority to highest -ORDER=common ark pending-common custom-overrides +ORDER=common ark pending-ark custom-overrides EMPTY=armv7hl armv7hl-debug armv7hl-lpae armv7hl-lpae-debug i686 i686-debug # x86_64 diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/process_configs.sh +++ b/redhat/configs/process_configs.sh @@ -388,16 +388,15 @@ done PACKAGE_NAME="${1:-kernel}" # defines the package name used KVERREL="$(test -n "$2" && echo "-$2" || echo "")" SUBARCH="$(test -n "$3" && echo "-$3" || echo "")" -FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")" +FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")" RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)" SCRIPT=$(readlink -f "$0") SCRIPT_DIR=$(dirname "$SCRIPT") -# Most RHEL options are options we want in Fedora so RHEL pending settings head -# to common/ +# Config options for RHEL should target the pending-ark directory, not pending-common. if [ "$FLAVOR" = "-rhel" ] then - FLAVOR="-common" + FLAVOR="-ark" fi # to handle this script being a symlink diff --git a/redhat/docs/faq.rst b/redhat/docs/faq.rst index blahblah..blahblah 100644 --- a/redhat/docs/faq.rst +++ b/redhat/docs/faq.rst @@ -22,13 +22,13 @@ bleeding edge. ---------------------------------------------------------- During the -rc1 and -rc2 phase, this is not uncommon. Most configs should -be autogenerated to defaults and placed in pending-common until an official +be autogenerated to defaults and placed in pending-ark until an official review has taken place. Occassionally during the review cycle, the default changes and new configs are revealed that are not autogenerated and leads to unresolved configs. -Creating a file under redhat/configs/pending-common/ with the config +Creating a file under redhat/configs/pending-ark/ with the config settings necessary should temporarily resolve this until the maintainers can resolve this properly. diff --git a/redhat/docs/repository-layout.rst b/redhat/docs/repository-layout.rst index blahblah..blahblah 100644 --- a/redhat/docs/repository-layout.rst +++ b/redhat/docs/repository-layout.rst @@ -134,8 +134,8 @@ A flavor is defined by: configuration directories and should include the directory you defined in step 2. -common and common-pending -~~~~~~~~~~~~~~~~~~~~~~~~~ +common and pending-ark +~~~~~~~~~~~~~~~~~~~~~~ The ``common`` directory contains configuration values that are shared across all configuration "flavors". For a configuration to be in @@ -145,19 +145,19 @@ can override settings in ``common``, so it's not guaranteed settings in common are the same across all flavors. It's simply a good place to set common values across the flavors and use as a base for new flavors. -``common-pending`` is where configuration options that have not been +``pending-ark`` is where configuration options that have not been reviewed are placed. Automation creates snippets for all new configuration options exposed during a rebase of ARK in the -``pending-common`` directory, at which point subsystem maintainers +``pending-ark`` directory, at which point subsystem maintainers review the options and set them as appropriate before moving them into ``common``. -New ARK configurations are placed in ``common-pending`` because it is +New ARK configurations are placed in ``pending-ark`` because it is assumed that ARK generally has the most conservative settings, whereas other flavors like Fedora will be (for the most part) a superset of the ARK configuration. -fedora and fedora-pending +fedora and pending-fedora ~~~~~~~~~~~~~~~~~~~~~~~~~ The ``fedora`` directory contains settings that have been reviewed by @@ -168,6 +168,6 @@ rebase to expose new configuration options that only apply to Fedora. For this reason, Fedora has a ``pending-fedora`` directory as well. ``pending-fedora`` contains settings that are not exposed by the ``common`` configuration set and only apply to Fedora. It is, like -``pending-common``, populated automatically during a rebase. A Fedora +``pending-ark``, populated automatically during a rebase. A Fedora kernel maintain can review the settings at their leisure and move them over to ``fedora`` as they do so. diff --git a/redhat/gen_config_patches.sh b/redhat/gen_config_patches.sh index blahblah..blahblah 100755 --- a/redhat/gen_config_patches.sh +++ b/redhat/gen_config_patches.sh @@ -107,13 +107,13 @@ for f in "$config_bundles_dir"/*; do # This loop actually grabs the help text to put in the commit while read -r line; do # last line is the actual config we need to put in the dir - tail -n 1 redhat/configs/pending-common/generic/"$line" > redhat/configs/common/generic/"$line" + tail -n 1 redhat/configs/pending-ark/generic/"$line" > redhat/configs/ark/generic/"$line" # get everything except the last line for the commit text - head -n -1 redhat/configs/pending-common/generic/"$line" | sed -e 's/^#//g' >> "$tmpdir"/commit + head -n -1 redhat/configs/pending-ark/generic/"$line" | sed -e 's/^#//g' >> "$tmpdir"/commit # add a nice separator that renders in gitlab echo -ne "\n---\n\n" >> "$tmpdir"/commit # remove the pending option - rm redhat/configs/pending-common/generic/"$line" + rm redhat/configs/pending-ark/generic/"$line" done < "$f" if [ -n "$RHMAINTAINERS" ] && [ -f ./scripts/get_maintainer.pl ] && [ -f "$RHMAINTAINERS" ]; then echo "" >> "$tmpdir"/commit -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1622 _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] 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/[email protected] Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
