linux: generate git refs automatically
A message that is not in the archive (sent off-list or not yet received): CGME20240620222738eucas1p1a1b87b83915f92e4d2697320873333fa@eucas1p1.samsung.com
v5 cover linux: generate git refs automatically
This adds support to generate git references automatically using make menuconfig, make refs-default and make refs-user.
With these targets, we can switch between Default and User Git Reference Modes to generate different lists of references. Default mode uses static references for the Development trees, kernel.org/releases.json, and static references for Linus, Next, and Stable trees. User mode generates the last 15 references for all trees, including the static references.
Please, read the docs/kdevops-autorefs.md from the second patch for a more detailed workflow explanation. And send me any questions if clarification is needed.
With so many changes in version 4, I decided to copy the questions from Luis in version 3.
Luis:
2) The expected day to do is not clear from the commit log. What aspects of no-use of this will generate a 'git diff' visible output if one does not use 'make dynconfig'?
None in a normal workflow. But in reality, only when updating the static references in the Development trees YAML file and running 'make refs-user'. The developer should send a patch upstream.
Note that 'make dynconfig' integration is dropped in this version in favor of the new targets 'refs-user' and 'refs-default'.
What aspects will generate a diff which
*should* be commited to the tree, ie how are kdevops developers expected to contribute to say a new revision of Linus' bump of a new rc candidate? The same applies to their git trees.
Only when updating the static references in the Development trees YAML file and running 'make refs-user'. The developer should send a patch upstream with the new YAML content as well as the autogenerate file. This does not apply to the Linux, Next and Stable trees as they are all the time generated with make menuconfig and make refs-default.
Changes since v4:
* Split renaming into its own patch as per Luis request. Note that config reference renaming is dropped in patch 2 as they are be autogenerated.
* Add static refs support in Next tree for fs-current and fs-next as per Chuck's suggestion.
* Refs now can be either Default References or User References.
* Refs are now generated into workflows/linux/refs/{default,user}/ Kconfig.*.
* Kconfig file names are renamed and simplified.
* 'make dynconfig' no longer has support to generate references.
* 'refs-default' and 'refs-user' targets added to switch in between 2 reference generation.
* Detection of modes is done by detecting if user refs are generated or not. This uses check_file_empty.sh script to set the Kconfig HAVE_BOOTLINUX_TREE_<TREE>_USER_REFS value depending on refs/user/ Kconfig.* content.
* Default Mode is explicitly run through _refs-default and specified in menuconfig dependent targets.
* Add verbosity mode to refs.Makefile. This enables echo but keeps the running commands silent.
* Add refs helper menu to indicate how to switch between Git Reference Modes.
* Minor fixes in the Kconfig generation output (tabs/spaces, etc).
* Some YAML entries were renamed to match the refs names.
* Documentation is added to explain workflow.
* generate_refs check for connectivity before trying to reach kernel.org servers to read releases.json or running git-ls-remote.
* User refs configuration names are suffixed with _USER_REF to avoid static duplicates. This duplicates the confs but prevents the warning 'choice value used outside its choice group'.
* Minor codying style changes in generate_refs script.
* Generated Kconfig now includes the HAVE_BOOTLINUX_xxx or !HAVE_BOOTLINUX_xxx based on the mode the output file is targeted.
Changes since v3:
* Change the strategy for the canon path (linus, next and stable trees):
* Current git references used in Kdevops are now included in a YAML file.
* This static references will be appended to the latest-and-greatest found by kreleases (kernel.org/releases.json).
* Minor typing fixes in generate_refs.py.
* --extra (config yaml) is now supported for gitrefs and kreleases sub-commands.
* Review files where new vars/configs were required to update because of renaming.
* Minor CONFIG renames for consistency.
Changes since v2:
* Rebase changes to latest kdevops.
* Add parser support for kernel.org/releases.json
* Add generate_refs.py subcommand support: gitref and kreleases.
* gitref: Retrieves refs from upstream repository.
* kreleases: Retrieves latest-and-greatest refs from kernel.org/releases.
* Integrate yaml with static configuration for mcgrof, jlayton and cel trees.
* Generate a default configuration file for all trees except for linus, next and stable.
* Kconfig.refs-{linus,next,stable} refs will automatically retrieve the information from kernel.org/releases.json every time make is run.
* Kconfig.refs-* files will be generated/forced when make dynconfig is run.
* Minor script changes: e.g. special case handling for CUSTOM entries.
* Minor Kconfig/Makefile renaming/cleanup.
Changes since v1:
* Script generation moved and called from the main Makefile.
* scripts/gen-refs.Makefile to generate refs.
* Conversion to python.
* Added support for:
* Command-line arguments to control options.
* YAML parser to configure extra and static references. Example added for mcgrof and mcgrof-next.
* Filter for tags and heads. Example to filter semantic versioning would be --filter-tags "*.*.*".
* File generation based on time. Update it every 24h (hardcoded). Possibility to use --force to always generate the file.
* git-ls-remote sorting inverted using --sort option and git versionsort.suffix option (to avoid sort --reverse).
Daniel
---
Daniel Gomez (3):
linux: rename refactor
linux: generate refs automatically
linux: add fs-current and fs-next configs
.gitignore | 5 + Makefile | 1 + README.md | 1 + defconfigs/cxl-switch | 8 +- defconfigs/nfsd | 4 +- defconfigs/xfs | 2 +- docs/how-extra-vars-generated.md | 8 +- docs/kdevops-autorefs.md | 118 +++++++ kconfigs/workflows/Kconfig | 2 + kconfigs/workflows/Kconfig.bootlinux | 37 +++ playbooks/roles/bootlinux/README.md | 4 +- playbooks/roles/bootlinux/defaults/main.yml | 4 +- playbooks/roles/bootlinux/tasks/main.yml | 8 +- .../roles/bootlinux/tasks/update-grub/install.yml | 6 +- scripts/check_file_empty.sh | 17 + scripts/gen-refs-default.Makefile | 52 ++++ scripts/gen-refs-user.Makefile | 154 ++++++++++ scripts/generate_refs.py | 341 +++++++++++++++++++++ scripts/kconfig/kconfig.Makefile | 2 +- scripts/refs.Makefile | 22 ++ scripts/workflows/fstests/fstests_watchdog.py | 4 +- scripts/workflows/generic/run_kernel_ci.sh | 2 +- workflows/fstests/Makefile | 4 +- .../xfs/unassigned/fstests-next-20230515 | 2 +- workflows/linux/Kconfig | 46 +-- workflows/linux/Kconfig.btrfs | 5 +- workflows/linux/Kconfig.cel | 36 +-- workflows/linux/Kconfig.jlayton | 36 +-- workflows/linux/Kconfig.kdevops | 18 +- workflows/linux/Kconfig.linus | 70 +---- workflows/linux/Kconfig.mcgrof | 50 +-- workflows/linux/Kconfig.next | 5 +- workflows/linux/Kconfig.stable | 64 +--- workflows/linux/Makefile | 14 +- workflows/linux/refs/default/Kconfig.btrfs-devel | 20 ++ workflows/linux/refs/default/Kconfig.cel-linux | 32 ++ workflows/linux/refs/default/Kconfig.jlayton-linux | 32 ++ workflows/linux/refs/default/Kconfig.kdevops-linus | 20 ++ workflows/linux/refs/default/Kconfig.mcgrof-linus | 26 ++ workflows/linux/refs/default/Kconfig.mcgrof-next | 26 ++ workflows/linux/refs/static/btrfs-devel.yaml | 6 + workflows/linux/refs/static/cel-linux.yaml | 14 + workflows/linux/refs/static/jlayton-linux.yaml | 14 + workflows/linux/refs/static/kdevops-linus.yaml | 6 + workflows/linux/refs/static/linus.yaml | 38 +++ workflows/linux/refs/static/mcgrof-linus.yaml | 10 + workflows/linux/refs/static/mcgrof-next.yaml | 10 + workflows/linux/refs/static/next.yaml | 14 + workflows/linux/refs/static/stable.yaml | 38 +++ 49 files changed, 1145 insertions(+), 313 deletions(-)
---
base-commit: 9f42f09ae473e6ebb81c9094ac924ddc27c9e38e
change-id: 20240620-linux-refs-a26f57d5fa3c
Best regards,
Signature · 1 line
Daniel Gomez <[email protected]>
PATCH v5 1/3 linux: rename refactor
Automatic git references introduced in the next commit requires to have consistency across variables for clarity and ease the autogeneration path.
Rename TAG to REF. Git references may be tags or branches, so use a more generit term.
Use CONFIG_BOOTLINUX_TREE_<TREE_NAME>_<SUFFIX> across all related options.
This commit does not make functional changes.
--- defconfigs/cxl-switch | 8 ++-- defconfigs/nfsd | 4 +- defconfigs/xfs | 2 +- docs/how-extra-vars-generated.md | 8 ++-- playbooks/roles/bootlinux/README.md | 4 +- playbooks/roles/bootlinux/defaults/main.yml | 4 +- playbooks/roles/bootlinux/tasks/main.yml | 8 ++-- .../roles/bootlinux/tasks/update-grub/install.yml | 6 +-- scripts/workflows/fstests/fstests_watchdog.py | 4 +- scripts/workflows/generic/run_kernel_ci.sh | 2 +- workflows/fstests/Makefile | 4 +- .../xfs/unassigned/fstests-next-20230515 | 2 +- workflows/linux/Kconfig | 46 +++++++++++----------- workflows/linux/Kconfig.btrfs | 6 ++- workflows/linux/Kconfig.cel | 24 +++++------ workflows/linux/Kconfig.jlayton | 24 +++++------ workflows/linux/Kconfig.kdevops | 8 ++-- workflows/linux/Kconfig.linus | 44 ++++++++++----------- workflows/linux/Kconfig.mcgrof | 28 ++++++------- workflows/linux/Kconfig.next | 4 +- workflows/linux/Kconfig.stable | 38 +++++++++--------- workflows/linux/Makefile | 14 +++---- 22 files changed, 148 insertions(+), 144 deletions(-)
defconfigs/cxl-switch +4 -4
@@ -13,12 +13,12 @@ CONFIG_WORKFLOW_LINUX_CUSTOM=y CONFIG_BOOTLINUX=y CONFIG_BOOTLINUX_9P=y CONFIG_BOOTLINUX_CUSTOM=y -CONFIG_BOOTLINUX_CUSTOM_NAME="cxl-fixes" -CONFIG_BOOTLINUX_CUSTOM_URL="https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git" -CONFIG_BOOTLINUX_CUSTOM_TAG="cxl-fixes-6.6-rc3" +CONFIG_BOOTLINUX_TREE_CUSTOM_NAME="cxl-fixes" +CONFIG_BOOTLINUX_TREE_CUSTOM_URL="https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git" +CONFIG_BOOTLINUX_TREE_CUSTOM_REF="cxl-fixes-6.6-rc3" CONFIG_BOOTLINUX_TREE_NAME="cxl-fixes" CONFIG_BOOTLINUX_TREE="https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git" -CONFIG_BOOTLINUX_TREE_TAG="cxl-fixes-6.6-rc3" +CONFIG_BOOTLINUX_TREE_REF="cxl-fixes-6.6-rc3" CONFIG_QEMU_ENABLE_CXL=y CONFIG_QEMU_ENABLE_CXL_SWITCH_TOPOLOGY_1=y CONFIG_WORKFLOWS_TESTS=y
defconfigs/nfsd +2 -2
@@ -279,13 +279,13 @@ CONFIG_BOOTLINUX_TREE_NEXT=y # CONFIG_BOOTLINUX_TREE_BTRFS_DEVEL is not set # CONFIG_BOOTLINUX_TREE_JLAYTON_LINUX is not set # CONFIG_BOOTLINUX_TREE_MCGROF_NEXT is not set -CONFIG_BOOTLINUX_TREE_NEXT_TAG="next-20240108" +CONFIG_BOOTLINUX_TREE_NEXT_REF="next-20240108" CONFIG_BOOTLINUX_TREE_NEXT_NAME="linux-next" CONFIG_BOOTLINUX_TREE_NEXT_URL="/mirror/linux-next.git" CONFIG_BOOTLINUX_TREE_NAME="linux-next" CONFIG_BOOTLINUX_TREE="/mirror/linux-next.git" # CONFIG_BOOTLINUX_TEST_MESSAGE_ID is not set -CONFIG_BOOTLINUX_TREE_TAG="next-20240108" +CONFIG_BOOTLINUX_TREE_REF="next-20240108" CONFIG_BOOTLINUX_TREE_LOCALVERSION="" # CONFIG_BOOTLINUX_SHALLOW_CLONE is not set # end of Get and install Linux from git
defconfigs/xfs +1 -1
@@ -8,7 +8,7 @@ CONFIG_BOOTLINUX=y CONFIG_BOOTLINUX_9P=y CONFIG_BOOTLINUX_LINUS=y CONFIG_BOOTLINUX_TREE_LINUS=y -CONFIG_BOOTLINUX_LINUS_69_RC6=y +CONFIG_BOOTLINUX_TREE_LINUS_REF_69_RC6=y CONFIG_WORKFLOWS_TESTS=y CONFIG_WORKFLOWS_LINUX_TESTS=y
docs/how-extra-vars-generated.md +4 -4
@@ -60,19 +60,19 @@ This make it easy to just `git grep BOOTLINUX_ARGS` to see what is defined. TREE_URL:=$(subst ",,$(CONFIG_BOOTLINUX_TREE)) TREE_NAME:=$(notdir $(TREE_URL)) TREE_NAME:=$(subst .git,,$(TREE_NAME)) -TREE_TAG:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_TAG)) +TREE_REF:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_REF)) TREE_LOCALVERSION:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_LOCALVERSION)) TREE_SHALLOW_DEPTH:=$(subst ",,$(CONFIG_BOOTLINUX_SHALLOW_CLONE_DEPTH)) -TREE_CONFIG:=config-$(TREE_TAG) +TREE_CONFIG:=config-$(TREE_REF) ifeq (y,$(CONFIG_BOOTLINUX_PURE_IOMAP)) -TREE_CONFIG:=config-$(TREE_TAG)-pure-iomap +TREE_CONFIG:=config-$(TREE_REF)-pure-iomap endif # Describes the Linux clone BOOTLINUX_ARGS += target_linux_git=$(TREE_URL) BOOTLINUX_ARGS += target_linux_tree=$(TREE_NAME) -BOOTLINUX_ARGS += target_linux_tag=$(TREE_TAG) +BOOTLINUX_ARGS += target_linux_ref=$(TREE_REF) BOOTLINUX_ARGS += target_linux_config=$(TREE_CONFIG) BOOTLINUX_ARGS += target_linux_localversion=$(TREE_LOCALVERSION) ```
playbooks/roles/bootlinux/README.md +2 -2
@@ -43,7 +43,7 @@ Role Variables * target_linux_tree: the name of the tree * target_linux_dir_path: where to place the tree on the target system - * target_linux_tag : the actual tag as used on linux, so v4.19.62 + * target_linux_ref : the actual tag as used on linux, so v4.19.62 * target_linux_extra_patch: if defined an extra patch to apply with git am prior to compilation * target_linux_config: the configuration file to use
@@ -87,7 +87,7 @@ You'd place the `pend-v4.19.58-fixes-20190716-v2.patch` file on the directory Now say you wantd to be explicit about a tag of Linux you'd want to use: ``` -ansible-playbook -i hosts -l dev --extra-vars "target_linux_tag=v4.19.21 "target_linux_extra_patch=try-v4.19.20-fixes-20190716-v1.patch" bootlinux.yml +ansible-playbook -i hosts -l dev --extra-vars "target_linux_ref=v4.19.21 "target_linux_extra_patch=try-v4.19.20-fixes-20190716-v1.patch" bootlinux.yml ``` To uninstall a kernel:
playbooks/roles/bootlinux/defaults/main.yml +2 -2
@@ -21,9 +21,9 @@ target_linux_tree: "linux-stable" target_linux_dir_path: "{{ data_path }}/{{ target_linux_tree }}" kdevops_baseline_and_dev: False -target_linux_tag: "v4.19.133" +target_linux_ref: "v4.19.133" target_linux_delta_file: -target_linux_config: "config-{{ target_linux_tag }}" +target_linux_config: "config-{{ target_linux_ref }}" make: "make" # Once ansible v2.10 becomes available we can move on to using # ansible_processor_nproc but that was merged in 2020:
playbooks/roles/bootlinux/tasks/main.yml +4 -4
@@ -80,7 +80,7 @@ dest: "{{ target_linux_dir_path }}" update: yes depth: "{{ target_linux_shallow_depth }}" - version: "{{ target_linux_tag }}" + version: "{{ target_linux_ref }}" retries: 3 delay: 5 register: result
@@ -95,7 +95,7 @@ dest: "{{ bootlinux_9p_host_path }}" update: yes depth: "{{ target_linux_shallow_depth }}" - version: "{{ target_linux_tag }}" + version: "{{ target_linux_ref }}" retries: 3 delay: 5 register: result
@@ -412,7 +412,7 @@ - name: Check kernel uname for uninstall debug: - msg: "Target kernel {{ target_linux_tag }} Running kernel {{ running_kernel }}" + msg: "Target kernel {{ target_linux_ref }} Running kernel {{ running_kernel }}" vars: running_kernel: "{{ uname_cmd_before.stdout_lines.0 }}" tags: [ 'uninstall-linux' ]
@@ -543,7 +543,7 @@ - name: Check kernel uname debug: - msg: "Target kernel {{ target_linux_tag }} Running kernel {{ running_kernel }}" + msg: "Target kernel {{ target_linux_ref }} Running kernel {{ running_kernel }}" vars: running_kernel: "{{ uname_cmd.stdout_lines.0 }}" tags: [ 'linux', 'git', 'config', 'uname' ]
playbooks/roles/bootlinux/tasks/update-grub/install.yml +3 -3
@@ -131,13 +131,13 @@ # is either you do the work to enhance the heuristic or live happy with the # assumption that grub2's default of picking the latest kernel is the best # option. -- name: Try to find your target kernel's GRUB boot entry number now that the menu is flattened for {{ target_linux_tag }} using inferred KERNELRELEASE {{ kernelrelease.stdout}} +- name: Try to find your target kernel's GRUB boot entry number now that the menu is flattened for {{ target_linux_ref }} using inferred KERNELRELEASE {{ kernelrelease.stdout}} become: yes become_flags: 'su - -c' become_method: sudo shell: " {{ determine_default_kernel_id }} " vars: - target_kernel: "{{ target_linux_tag | replace('v', '') }}" + target_kernel: "{{ target_linux_ref | replace('v', '') }}" register: grub_boot_number_cmd tags: [ 'linux', 'git', 'config', 'saved' ] when: kernel_release_file.stat.exists
@@ -170,7 +170,7 @@ debug: msg: "{{ target_kernel }} determined to be {{ target_boot_entry }} on the GRUB2 flat menu. Ran: grub-set-default {{ target_boot_entry }}" vars: - target_kernel: "{{ target_linux_tag | replace('v', '') }}" + target_kernel: "{{ target_linux_ref | replace('v', '') }}" target_boot_entry: "{{ grub_boot_number_cmd.stdout_lines.0 }}" tags: [ 'linux', 'git', 'config', 'saved' ] when:
scripts/workflows/fstests/fstests_watchdog.py +2 -2
@@ -21,8 +21,8 @@ def print_fstest_host_status(host, verbose, use_remote, use_ssh, basedir, config configured_kernel = None if "CONFIG_WORKFLOW_LINUX_DISTRO" in config: configured_kernel = "Distro-kernel" - elif "CONFIG_BOOTLINUX_TREE_TAG" in config: - configured_kernel = config["CONFIG_BOOTLINUX_TREE_TAG"].strip('\"') + elif "CONFIG_BOOTLINUX_TREE_REF" in config: + configured_kernel = config["CONFIG_BOOTLINUX_TREE_REF"].strip('\"') remote_path = "/var/log/journal/remote/" kernel = systemd_remote.get_uname(remote_path, host, configured_kernel) if kernel == configured_kernel:
scripts/workflows/generic/run_kernel_ci.sh +1 -1
@@ -50,7 +50,7 @@ kernel_ci_subject_topic() if [[ "$CONFIG_KERNEL_CI_ADD_CUSTOM_SUBJECT_TOPIC" != "y" ]]; then echo "kernel-ci on $(hostname)" elif [[ "$CONFIG_KERNEL_CI_ADD_CUSTOM_SUBJECT_TOPIC_TAG" == "y" ]]; then - echo "kernel-ci on $(hostname) $CONFIG_KERNEL_CI_SUBJECT_TOPIC $CONFIG_BOOTLINUX_TREE_TAG" + echo "kernel-ci on $(hostname) $CONFIG_KERNEL_CI_SUBJECT_TOPIC $CONFIG_BOOTLINUX_TREE_REF" else echo "kernel-ci on $(hostname) $CONFIG_KERNEL_CI_SUBJECT_TOPIC" fi
workflows/fstests/Makefile +2 -2
@@ -99,8 +99,8 @@ FSTESTS_ARGS += fstests_testdev_nvme_fallback_model_serial='True' endif ifeq (y,$(CONFIG_CONFIG_BOOTLINUX)) -TREE_TAG:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_TAG)) -FSTESTS_ARGS += fstests_perf_config='$(PROJECTRELEASE)-kernel-$(TREE_TAG)' +TREE_REF:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_REF)) +FSTESTS_ARGS += fstests_perf_config='$(PROJECTRELEASE)-kernel-$(TREE_REF)' endif ifeq (,$(CONFIG_CONFIG_BOOTLINUX)) FSTESTS_ARGS += fstests_perf_config='$(PROJECTRELEASE)-kernel-distro'
workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515 +1 -1
@@ -199,7 +199,7 @@ CONFIG_BOOTLINUX_TREE_NEXT=y # CONFIG_BOOTLINUX_TREE_MCGROF_NEXT is not set CONFIG_BOOTLINUX_TREE_NAME="linux-next" CONFIG_BOOTLINUX_TREE="/mirror/linux-next.git" -CONFIG_BOOTLINUX_TREE_TAG="next-20230426" +CONFIG_BOOTLINUX_TREE_REF="next-20230426" CONFIG_BOOTLINUX_TREE_LOCALVERSION="" # CONFIG_BOOTLINUX_SHALLOW_CLONE is not set # end of Get and install Linux from git
workflows/linux/Kconfig +23 -23
81 lines not on this page · raw message
workflows/linux/Kconfig.btrfs +5 -1
@@ -1,9 +1,13 @@ if BOOTLINUX_TREE_BTRFS_DEVEL -config BOOTLINUX_TREE_BTRFS_DEVEL_TAG +config BOOTLINUX_TREE_BTRFS_DEVEL_REF_BTRFSDEVEL string default "btrfs-devel" +config BOOTLINUX_TREE_BTRFS_DEVEL_REF + string + default "btrfs-devel" if BOOTLINUX_TREE_BTRFS_DEVEL_REF_BTRFSDEVEL + config BOOTLINUX_TREE_BTRFS_DEVEL_NAME string default "btrfs-devel"
workflows/linux/Kconfig.cel +12 -12
@@ -2,43 +2,43 @@ if BOOTLINUX_TREE_CEL_LINUX choice prompt "cel-linux branch to use" - default BOOTLINUX_CEL_LINUX_NEXT + default BOOTLINUX_TREE_CEL_LINUX_NEXT -config BOOTLINUX_CEL_LINUX_NEXT +config BOOTLINUX_TREE_CEL_LINUX_NEXT bool "nfsd-next" help Pull the nfsd-next branch. -config BOOTLINUX_CEL_LINUX_FIXES +config BOOTLINUX_TREE_CEL_LINUX_FIXES bool "nfsd-fixes" help Pull the nfsd-fixes branch. -config BOOTLINUX_CEL_LINUX_CUSTOM +config BOOTLINUX_TREE_CEL_LINUX_CUSTOM bool "Custom branch name" help Pull a custom branch name. endchoice -config BOOTLINUX_CEL_LINUX_CUSTOM_NAME +config BOOTLINUX_TREE_CEL_LINUX_CUSTOM_NAME string "Custom branch name" default "custom" - depends on BOOTLINUX_CEL_LINUX_CUSTOM + depends on BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM help Custom branch name to use for Chuck Lever's linux tree. -config BOOTLINUX_CEL_TREE_TAG +config BOOTLINUX_TREE_CEL_LINUX_REF string - default "nfsd-next" if BOOTLINUX_CEL_LINUX_NEXT - default "nfsd-fixes" if BOOTLINUX_CEL_LINUX_FIXES - default BOOTLINUX_CEL_LINUX_CUSTOM_NAME if BOOTLINUX_CEL_LINUX_CUSTOM + default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_NEXT + default "nfsd-fixes" if BOOTLINUX_TREE_CEL_LINUX_FIXES + default BOOTLINUX_TREE_CEL_LINUX_CUSTOM_NAME if BOOTLINUX_TREE_CEL_LINUX_CUSTOM -config BOOTLINUX_CEL_TREE_NAME +config BOOTLINUX_TREE_CEL_LINUX_NAME string default "cel-linux" -config BOOTLINUX_CEL_TREE_URL +config BOOTLINUX_TREE_CEL_LINUX_URL string default "https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git" if BOOTLINUX_TREE_CEL_LINUX
workflows/linux/Kconfig.jlayton +12 -12
@@ -2,43 +2,43 @@ if BOOTLINUX_TREE_JLAYTON_LINUX choice prompt "jlayton-linux branch to use" - default BOOTLINUX_JLAYTON_LINUX_KDEVOPS + default BOOTLINUX_TREE_JLAYTON_LINUX_KDEVOPS -config BOOTLINUX_JLAYTON_LINUX_KDEVOPS +config BOOTLINUX_TREE_JLAYTON_LINUX_KDEVOPS bool "kdevops" help Use the kdevops branch. -config BOOTLINUX_JLAYTON_LINUX_IVERSION +config BOOTLINUX_TREE_JLAYTON_LINUX_IVERSION bool "iversion-next" help Use the iversion-next branch. -config BOOTLINUX_JLAYTON_LINUX_CUSTOM +config BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM bool "Custom branch name" help Use a custom branch name. endchoice -config BOOTLINUX_JLAYTON_LINUX_CUSTOM_NAME +config BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM_NAME string "Custom branch name" default "kdevops" - depends on BOOTLINUX_JLAYTON_LINUX_CUSTOM + depends on BOOTLINUX_TREE_JLAYTON_LINUX_REF_CUSTOM help Custom branch name to use for Jeff Layton's linux tree. -config BOOTLINUX_JLAYTON_LINUX_TAG +config BOOTLINUX_TREE_JLAYTON_LINUX_REF string - default BOOTLINUX_JLAYTON_LINUX_CUSTOM_NAME if BOOTLINUX_JLAYTON_LINUX_CUSTOM - default "kdevops" if BOOTLINUX_JLAYTON_LINUX_KDEVOPS - default "iversion-next" if BOOTLINUX_JLAYTON_LINUX_IVERSION + default BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM_NAME if BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM + default "kdevops" if BOOTLINUX_TREE_JLAYTON_LINUX_KDEVOPS + default "iversion-next" if BOOTLINUX_TREE_JLAYTON_LINUX_IVERSION -config BOOTLINUX_JLAYTON_TREE_NAME +config BOOTLINUX_TREE_JLAYTON_LINUX_NAME string default "jlayton-linux" -config BOOTLINUX_JLAYTON_TREE_URL +config BOOTLINUX_TREE_JLAYTON_LINUX_URL string default "git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git" if BOOTLINUX_TREE_JLAYTON_LINUX
workflows/linux/Kconfig.kdevops +4 -4
@@ -2,9 +2,9 @@ if BOOTLINUX_TREE_KDEVOPS_LINUS choice prompt "kdevops-linus branch to use" - default BOOTLINUX_KDEVOPS_LINUS_LBS_MINORDER + default BOOTLINUX_TREE_KDEVOPS_LINUS_LBS_MINORDER -config BOOTLINUX_KDEVOPS_LINUS_LBS_MINORDER +config BOOTLINUX_TREE_KDEVOPS_LINUS_LBS_MINORDER bool "large-block-minorder" help Use the latest LBS branch based on Linus' tree.
@@ -16,11 +16,11 @@ config BOOTLINUX_TREE_KDEVOPS_URL default "https://github.com/linux-kdevops/linux.git" if !USE_LOCAL_LINUX_MIRROR default "/mirror/kdevops-linus.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P -config BOOTLINUX_KDEVOPS_TREE_TAG +config BOOTLINUX_TREE_KDEVOPS_REF string default "large-block-minorder" -config BOOTLINUX_KDEVOPS_TREE_NAME +config BOOTLINUX_TREE_KDEVOPS_NAME string default "kdevops-linus"
workflows/linux/Kconfig.linus +22 -22
94 lines not on this page · raw message
workflows/linux/Kconfig.mcgrof +14 -14
@@ -2,14 +2,14 @@ if BOOTLINUX_TREE_MCGROF_LINUS choice prompt "mcgrof-linus branch to use" - default BOOTLINUX_MCGROF_LINUS_LBS + default BOOTLINUX_TREE_MCGROF_LINUS_LBS -config BOOTLINUX_MCGROF_LINUS_LBS +config BOOTLINUX_TREE_MCGROF_LINUS_LBS bool "large-block-linus" help Use the latest LBS branch based on Linus' tree. -config BOOTLINUX_MCGROF_LINUS_LBS_NOBDEV +config BOOTLINUX_TREE_MCGROF_LINUS_LBS_NOBDEV bool "large-block-linus-nobdev" help Use the latest minimal branch for LBS which let's you use LBS
@@ -23,15 +23,15 @@ if BOOTLINUX_TREE_MCGROF_NEXT choice prompt "mcgrof-next branch to use" - default BOOTLINUX_MCGROF_NEXT_LBS + default BOOTLINUX_TREE_MCGROF_NEXT_LBS -config BOOTLINUX_MCGROF_NEXT_LBS +config BOOTLINUX_TREE_MCGROF_NEXT_LBS bool "large-block-next" help Use the latest stable LBS branch which enables all the bells and whistles for all types of LBS devices. -config BOOTLINUX_MCGROF_NEXT_LBS_NOBDEV +config BOOTLINUX_TREE_MCGROF_NEXT_LBS_NOBDEV bool "large-block-nobdev" help Use the latest minimal branch for LBS which let's you use LBS
@@ -43,23 +43,23 @@ endif # BOOTLINUX_TREE_MCGROF_NEXT if BOOTLINUX_TREE_MCGROF_LINUS || BOOTLINUX_TREE_MCGROF_NEXT -config BOOTLINUX_MCGROF_TREE +config BOOTLINUX_TREE_MCGROF bool default y -config BOOTLINUX_MCGROF_TREE_TAG +config BOOTLINUX_TREE_MCGROF_REF string - default "large-block-linus" if BOOTLINUX_MCGROF_LINUS_LBS - default "large-block-linus-nobdev" if BOOTLINUX_MCGROF_LINUS_LBS_NOBDEV - default "large-block-20230915" if BOOTLINUX_MCGROF_NEXT_LBS - default "large-block-nobdev-20230915" if BOOTLINUX_MCGROF_NEXT_LBS_NOBDEV + default "large-block-linus" if BOOTLINUX_TREE_MCGROF_LINUS_LBS + default "large-block-linus-nobdev" if BOOTLINUX_TREE_MCGROF_LINUS_LBS_NOBDEV + default "large-block-20230915" if BOOTLINUX_TREE_MCGROF_NEXT_LBS + default "large-block-nobdev-20230915" if BOOTLINUX_TREE_MCGROF_NEXT_LBS_NOBDEV -config BOOTLINUX_MCGROF_TREE_NAME +config BOOTLINUX_TREE_MCGROF_NAME string default "mcgrof-linus" if BOOTLINUX_TREE_MCGROF_LINUS default "mcgrof-next" if BOOTLINUX_TREE_MCGROF_NEXT -config BOOTLINUX_MCGROF_TREE_URL +config BOOTLINUX_TREE_MCGROF_URL string default "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && !USE_LOCAL_LINUX_MIRROR default "/mirror/mcgrof-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
workflows/linux/Kconfig.next +2 -2
@@ -1,7 +1,7 @@ if BOOTLINUX_TREE_NEXT -config BOOTLINUX_TREE_NEXT_TAG - string "linux-next tag to pull" +config BOOTLINUX_TREE_NEXT_REF + string "linux-next ref to pull" default "next-20240424" config BOOTLINUX_TREE_NEXT_NAME
workflows/linux/Kconfig.stable +19 -19
@@ -15,49 +15,49 @@ if BOOTLINUX_TREE_STABLE choice prompt "Stable branch to use" - default BOOTLINUX_STABLE_V66 + default BOOTLINUX_TREE_STABLE_V66 -config BOOTLINUX_STABLE_V419 +config BOOTLINUX_TREE_STABLE_V419 bool "linux-4.19.y" help Automatically enable the latest supported linux-4.19.y kernel. -config BOOTLINUX_STABLE_V54 +config BOOTLINUX_TREE_STABLE_V54 bool "linux-5.4.y" help Automatically enable the latest supported linux-5.4.y kernel. -config BOOTLINUX_STABLE_V510 +config BOOTLINUX_TREE_STABLE_V510 bool "linux-5.10.y" help Automatically enable the latest supported linux-5.10.y kernel. -config BOOTLINUX_STABLE_V514 +config BOOTLINUX_TREE_STABLE_V514 bool "linux-5.14.y" help Automatically enable the latest supported linux-5.14.y kernel. -config BOOTLINUX_STABLE_V517 +config BOOTLINUX_TREE_STABLE_V517 bool "linux-5.17.y" help Automatically enable the latest supported linux-5.17.y kernel. -config BOOTLINUX_STABLE_V519 +config BOOTLINUX_TREE_STABLE_V519 bool "linux-5.19.y" help Automatically enable the latest supported linux-5.19.y kernel. -config BOOTLINUX_STABLE_V60 +config BOOTLINUX_TREE_STABLE_V60 bool "linux-6.0.y" help Automatically enable the latest supported linux-6.0.y kernel. -config BOOTLINUX_STABLE_V61 +config BOOTLINUX_TREE_STABLE_V61 bool "linux-6.1.y" help Automatically enable the latest supported linux-6.1.y kernel. -config BOOTLINUX_STABLE_V66 +config BOOTLINUX_TREE_STABLE_V66 bool "linux-6.6.y" help Automatically enable the latest supported linux-6.6.y kernel.
@@ -68,15 +68,15 @@ endif # BOOTLINUX_TREE_STABLE config BOOTLINUX_TREE_STABLE_TAG string - default "v4.19.133" if BOOTLINUX_STABLE_V419 - default "v5.4.210" if BOOTLINUX_STABLE_V54 - default "v5.10.105" if BOOTLINUX_STABLE_V510 - default "v5.14.4" if BOOTLINUX_STABLE_V514 - default "v5.17-rc7" if BOOTLINUX_STABLE_V517 - default "v5.19-rc4" if BOOTLINUX_STABLE_V519 - default "v6.0.9" if BOOTLINUX_STABLE_V60 - default "linux-6.1.y" if BOOTLINUX_STABLE_V61 - default "linux-6.6.y" if BOOTLINUX_STABLE_V66 + default "v4.19.133" if BOOTLINUX_TREE_STABLE_V419 + default "v5.4.210" if BOOTLINUX_TREE_STABLE_V54 + default "v5.10.105" if BOOTLINUX_TREE_STABLE_V510 + default "v5.14.4" if BOOTLINUX_TREE_STABLE_V514 + default "v5.17-rc7" if BOOTLINUX_TREE_STABLE_V517 + default "v5.19-rc4" if BOOTLINUX_TREE_STABLE_V519 + default "v6.0.9" if BOOTLINUX_TREE_STABLE_V60 + default "linux-6.1.y" if BOOTLINUX_TREE_STABLE_V61 + default "linux-6.6.y" if BOOTLINUX_TREE_STABLE_V66 config BOOTLINUX_TREE_STABLE_NAME string
workflows/linux/Makefile +7 -7
@@ -3,25 +3,25 @@ TREE_URL:=$(subst ",,$(CONFIG_BOOTLINUX_TREE)) TREE_NAME:=$(notdir $(TREE_URL)) TREE_NAME:=$(subst .git,,$(TREE_NAME)) -TREE_TAG:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_TAG)) +TREE_REF:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_REF)) TREE_KERNELRELEASE:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_KERNELRELEASE)) TREE_LOCALVERSION:=$(subst ",,$(CONFIG_BOOTLINUX_TREE_LOCALVERSION)) TREE_SHALLOW_DEPTH:=$(subst ",,$(CONFIG_BOOTLINUX_SHALLOW_CLONE_DEPTH)) -TREE_CONFIG:=config-$(TREE_TAG) +TREE_CONFIG:=config-$(TREE_REF) ifeq (y,$(CONFIG_BOOTLINUX_PURE_IOMAP)) -TREE_CONFIG:=config-$(TREE_TAG)-pure-iomap +TREE_CONFIG:=config-$(TREE_REF)-pure-iomap endif # Describes the Linux clone BOOTLINUX_ARGS += target_linux_git=$(TREE_URL) -# ifeq (y,$(CONFIG_BOOTLINUX_CUSTOM_NAME)) -ifdef CONFIG_BOOTLINUX_CUSTOM_NAME -BOOTLINUX_ARGS += target_linux_tree=$(CONFIG_BOOTLINUX_CUSTOM_NAME) +# ifeq (y,$(CONFIG_BOOTLINUX_TREE_CUSTOM_NAME)) +ifdef CONFIG_BOOTLINUX_TREE_CUSTOM_NAME +BOOTLINUX_ARGS += target_linux_tree=$(CONFIG_BOOTLINUX_TREE_CUSTOM_NAME) else BOOTLINUX_ARGS += target_linux_tree=$(TREE_NAME) endif -BOOTLINUX_ARGS += target_linux_tag=$(TREE_TAG) +BOOTLINUX_ARGS += target_linux_ref=$(TREE_REF) BOOTLINUX_ARGS += target_linux_config=$(TREE_CONFIG) BOOTLINUX_ARGS += target_linux_kernelrelease=$(TREE_KERNELRELEASE) BOOTLINUX_ARGS += target_linux_localversion=$(TREE_LOCALVERSION)
Signature · 1 line
2.43.0
PATCH v5 2/3 linux: generate refs automatically
In reply to Daniel GomezGenerate a Kconfig choice/endchoice menu with a list of the latest Git references for Linus, Stable, Next and Development trees.
The patch introduces Git References that operates in 2 modes: Default and User. Depending on the mode and tree, the Git References behaves as follows:
* Default Mode: Linus, Next and Stable trees: latest-and-greatest + static refs.
* Default Mode: Development trees: static refs (included in this patch).
* User Mode: Linux, Next, Stable and Development trees: latest 15 Git References found upstream + static refs.
The script included (generate_refs.py) will create the Kconfig choice options with the latest and greatest kernel release references provided by kernel.org/releases.json including the static references defined in the YAML files. Every time make is run, the script will check for the date of the last modification, and will force an update if more than 24h has passed since last modification. The generated files are:
refs/default/Kconfig.{linus,next,stable}.
refs/default/Kconfig.{btrfs-devel,cel-linux,jlayton-linux,kdevops-linus, mcgrof-linus,mcgrof-next} files are autogenerated using their respective YAML static configuration files. This is to be able to run gitrefs subcommand and automatically generate the latest references including the static ones (refs/user/Kconfig.*). This User Mode will be used until refs/user/Kconfig.* files are cleared.
--- .gitignore | 5 + Makefile | 1 + README.md | 1 + docs/kdevops-autorefs.md | 118 +++++++ kconfigs/workflows/Kconfig | 2 + kconfigs/workflows/Kconfig.bootlinux | 37 +++ scripts/check_file_empty.sh | 17 + scripts/gen-refs-default.Makefile | 52 ++++ scripts/gen-refs-user.Makefile | 154 ++++++++++ scripts/generate_refs.py | 341 +++++++++++++++++++++ scripts/kconfig/kconfig.Makefile | 2 +- scripts/refs.Makefile | 22 ++ workflows/linux/Kconfig.btrfs | 9 +- workflows/linux/Kconfig.cel | 28 +- workflows/linux/Kconfig.jlayton | 28 +- workflows/linux/Kconfig.kdevops | 16 +- workflows/linux/Kconfig.linus | 70 +---- workflows/linux/Kconfig.mcgrof | 44 +-- workflows/linux/Kconfig.next | 5 +- workflows/linux/Kconfig.stable | 64 +--- workflows/linux/refs/default/Kconfig.btrfs-devel | 20 ++ workflows/linux/refs/default/Kconfig.cel-linux | 32 ++ workflows/linux/refs/default/Kconfig.jlayton-linux | 32 ++ workflows/linux/refs/default/Kconfig.kdevops-linus | 20 ++ workflows/linux/refs/default/Kconfig.mcgrof-linus | 26 ++ workflows/linux/refs/default/Kconfig.mcgrof-next | 26 ++ workflows/linux/refs/static/btrfs-devel.yaml | 6 + workflows/linux/refs/static/cel-linux.yaml | 14 + workflows/linux/refs/static/jlayton-linux.yaml | 14 + workflows/linux/refs/static/kdevops-linus.yaml | 6 + workflows/linux/refs/static/linus.yaml | 38 +++ workflows/linux/refs/static/mcgrof-linus.yaml | 10 + workflows/linux/refs/static/mcgrof-next.yaml | 10 + workflows/linux/refs/static/next.yaml | 6 + workflows/linux/refs/static/stable.yaml | 38 +++ 35 files changed, 1067 insertions(+), 247 deletions(-)
.gitignore +5 -0
@@ -80,6 +80,11 @@ playbooks/roles/linux-mirror/linux-mirror-systemd/xfsprogs-mirror.timer # yet. workflows/selftests/results/ +workflows/linux/refs/default/Kconfig.linus +workflows/linux/refs/default/Kconfig.next +workflows/linux/refs/default/Kconfig.stable +workflows/linux/refs/user + .kernel-ci.* .kotd.*
Makefile +1 -0
@@ -174,6 +174,7 @@ endif include scripts/gen-hosts.Makefile include scripts/gen-nodes.Makefile +include scripts/refs.Makefile # disable built-in rules for this .SUFFIXES:
README.md +1 -0
@@ -335,6 +335,7 @@ Below are sections which get into technical details of how kdevops works. * [Adding a new workflow to kdevops](docs/adding-a-new-workflow.md) * [Kconfig integration](docs/kconfig-integration.md) * [kdevops dynamic Kconfig support](docs/kdevops-dynamic-configuration.md) + * [kdevops Git Reference generation support](docs/kdevops-autorefs.md) * [Motivation behind kdevops](docs/motivations.md) * [Linux distribution support](docs/linux-distro-support.md) * [Overriding all Ansible role options with one file](docs/ansible-override.md)
docs/kdevops-autorefs.md new file +118 -0
118 lines not on this page · raw message
kconfigs/workflows/Kconfig +2 -0
@@ -1,6 +1,8 @@ config HAVE_SUPPORTS_PURE_IOMAP bool +source "kconfigs/workflows/Kconfig.bootlinux" + config WORKFLOWS bool "Enable different target workflows" default y
kconfigs/workflows/Kconfig.bootlinux new file +37 -0
@@ -0,0 +1,37 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 + +config HAVE_BOOTLINUX_TREE_LINUS_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.linus) + +config HAVE_BOOTLINUX_TREE_NEXT_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.next) + +config HAVE_BOOTLINUX_TREE_STABLE_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.stable) + +config HAVE_BOOTLINUX_TREE_MCGROF_LINUS_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.mcgrof-linus) + +config HAVE_BOOTLINUX_TREE_MCGROF_NEXT_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.mcgrof-next) + +config HAVE_BOOTLINUX_TREE_BTRFS_DEVEL_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.btrfs-devel) + +config HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.cel-linux) + +config HAVE_BOOTLINUX_TREE_JLAYTON_LINUX_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.jlayton-linux) + +config HAVE_BOOTLINUX_TREE_KDEVOPS_LINUS_USER_REFS + bool + default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.kdevops-linus)
scripts/check_file_empty.sh new file +17 -0
@@ -0,0 +1,17 @@ +#!/bin/bash +# SPDX-License-Identifier: copyleft-next-0.3.1 + +FILE="$1" + +# Ensure directory and file are created +mkdir --parents $(dirname $FILE) +if [ ! -f "$FILE" ]; then + touch $FILE +fi + +if [ -s "$FILE" ]; then + echo y + exit +fi + +echo n
scripts/gen-refs-default.Makefile new file +52 -0
52 lines not on this page · raw message
scripts/gen-refs-user.Makefile new file +154 -0
154 lines not on this page · raw message
scripts/generate_refs.py new file +341 -0
341 lines not on this page · raw message
scripts/kconfig/kconfig.Makefile +1 -1
@@ -37,7 +37,7 @@ $(KCONFIG_DIR)/mconf: $(MAKE) -C $(KCONFIG_DIR) mconf PHONY += menuconfig -menuconfig: $(KCONFIG_DIR)/mconf include/config/project.release Kconfig +menuconfig: $(KCONFIG_DIR)/mconf include/config/project.release Kconfig _refs-default @$< Kconfig $(KCONFIG_DIR)/nconf:
scripts/refs.Makefile new file +22 -0
@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 + +ifeq ($(V),1) +export Q=@ +export E=echo +else +export Q=@ +export E=true +endif + +include scripts/gen-refs-default.Makefile +include scripts/gen-refs-user.Makefile + +PHONY += refs-help-menu +refs-help-menu: + @echo "Generate git references options" + @echo "refs-default - Switch to Git Reference Default Mode" + @echo "refs-user - Switch to Git Reference User Mode" + @echo "" + +HELP_TARGETS += refs-help-menu +.PHONY = $(PHONY)
workflows/linux/Kconfig.btrfs +2 -7
@@ -1,12 +1,7 @@ if BOOTLINUX_TREE_BTRFS_DEVEL -config BOOTLINUX_TREE_BTRFS_DEVEL_REF_BTRFSDEVEL - string - default "btrfs-devel" - -config BOOTLINUX_TREE_BTRFS_DEVEL_REF - string - default "btrfs-devel" if BOOTLINUX_TREE_BTRFS_DEVEL_REF_BTRFSDEVEL +source "workflows/linux/refs/default/Kconfig.btrfs-devel" +source "workflows/linux/refs/user/Kconfig.btrfs-devel" config BOOTLINUX_TREE_BTRFS_DEVEL_NAME string
workflows/linux/Kconfig.cel +2 -26
@@ -1,25 +1,7 @@ if BOOTLINUX_TREE_CEL_LINUX -choice - prompt "cel-linux branch to use" - default BOOTLINUX_TREE_CEL_LINUX_NEXT - -config BOOTLINUX_TREE_CEL_LINUX_NEXT - bool "nfsd-next" - help - Pull the nfsd-next branch. - -config BOOTLINUX_TREE_CEL_LINUX_FIXES - bool "nfsd-fixes" - help - Pull the nfsd-fixes branch. - -config BOOTLINUX_TREE_CEL_LINUX_CUSTOM - bool "Custom branch name" - help - Pull a custom branch name. - -endchoice +source "workflows/linux/refs/default/Kconfig.cel-linux" +source "workflows/linux/refs/user/Kconfig.cel-linux" config BOOTLINUX_TREE_CEL_LINUX_CUSTOM_NAME string "Custom branch name"
@@ -28,12 +10,6 @@ config BOOTLINUX_TREE_CEL_LINUX_CUSTOM_NAME help Custom branch name to use for Chuck Lever's linux tree. -config BOOTLINUX_TREE_CEL_LINUX_REF - string - default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_NEXT - default "nfsd-fixes" if BOOTLINUX_TREE_CEL_LINUX_FIXES - default BOOTLINUX_TREE_CEL_LINUX_CUSTOM_NAME if BOOTLINUX_TREE_CEL_LINUX_CUSTOM - config BOOTLINUX_TREE_CEL_LINUX_NAME string default "cel-linux"
workflows/linux/Kconfig.jlayton +2 -26
@@ -1,25 +1,7 @@ if BOOTLINUX_TREE_JLAYTON_LINUX -choice - prompt "jlayton-linux branch to use" - default BOOTLINUX_TREE_JLAYTON_LINUX_KDEVOPS - -config BOOTLINUX_TREE_JLAYTON_LINUX_KDEVOPS - bool "kdevops" - help - Use the kdevops branch. - -config BOOTLINUX_TREE_JLAYTON_LINUX_IVERSION - bool "iversion-next" - help - Use the iversion-next branch. - -config BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM - bool "Custom branch name" - help - Use a custom branch name. - -endchoice +source "workflows/linux/refs/default/Kconfig.jlayton-linux" +source "workflows/linux/refs/user/Kconfig.jlayton-linux" config BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM_NAME string "Custom branch name"
@@ -28,12 +10,6 @@ config BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM_NAME help Custom branch name to use for Jeff Layton's linux tree. -config BOOTLINUX_TREE_JLAYTON_LINUX_REF - string - default BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM_NAME if BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM - default "kdevops" if BOOTLINUX_TREE_JLAYTON_LINUX_KDEVOPS - default "iversion-next" if BOOTLINUX_TREE_JLAYTON_LINUX_IVERSION - config BOOTLINUX_TREE_JLAYTON_LINUX_NAME string default "jlayton-linux"
workflows/linux/Kconfig.kdevops +2 -14
@@ -1,25 +1,13 @@ if BOOTLINUX_TREE_KDEVOPS_LINUS -choice - prompt "kdevops-linus branch to use" - default BOOTLINUX_TREE_KDEVOPS_LINUS_LBS_MINORDER - -config BOOTLINUX_TREE_KDEVOPS_LINUS_LBS_MINORDER - bool "large-block-minorder" - help - Use the latest LBS branch based on Linus' tree. - -endchoice +source "workflows/linux/refs/default/Kconfig.kdevops-linus" +source "workflows/linux/refs/user/Kconfig.kdevops-linus" config BOOTLINUX_TREE_KDEVOPS_URL string default "https://github.com/linux-kdevops/linux.git" if !USE_LOCAL_LINUX_MIRROR default "/mirror/kdevops-linus.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P -config BOOTLINUX_TREE_KDEVOPS_REF - string - default "large-block-minorder" - config BOOTLINUX_TREE_KDEVOPS_NAME string default "kdevops-linus"
workflows/linux/Kconfig.linus +2 -68
76 lines not on this page · raw message
workflows/linux/Kconfig.mcgrof +4 -40
60 lines not on this page · raw message
workflows/linux/Kconfig.next +2 -3
@@ -1,8 +1,7 @@ if BOOTLINUX_TREE_NEXT -config BOOTLINUX_TREE_NEXT_REF - string "linux-next ref to pull" - default "next-20240424" +source "workflows/linux/refs/default/Kconfig.next" +source "workflows/linux/refs/user/Kconfig.next" config BOOTLINUX_TREE_NEXT_NAME string
workflows/linux/Kconfig.stable +2 -62
73 lines not on this page · raw message
workflows/linux/refs/default/Kconfig.btrfs-devel new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 +# Automatically generated file + +if !HAVE_BOOTLINUX_TREE_BTRFS_DEVEL_USER_REFS + +choice + prompt "Tag or branch to use" + +config BOOTLINUX_TREE_BTRFS_DEVEL_REF_BTRFSDEVEL + bool "btrfs-devel" + help + Use development branch. + +endchoice + +config BOOTLINUX_TREE_BTRFS_DEVEL_REF + string + default "btrfs-devel" if BOOTLINUX_TREE_BTRFS_DEVEL_REF_BTRFSDEVEL + +endif # !HAVE_BOOTLINUX_TREE_BTRFS_DEVEL_USER_REFS
workflows/linux/refs/default/Kconfig.cel-linux new file +32 -0
@@ -0,0 +1,32 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 +# Automatically generated file + +if !HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFS + +choice + prompt "Tag or branch to use" + +config BOOTLINUX_TREE_CEL_LINUX_REF_NEXT + bool "nfsd-next" + help + Pull the nfsd-next branch. + +config BOOTLINUX_TREE_CEL_LINUX_REF_FIXES + bool "nfsd-fixed" + help + Pull the nfsd-fixed branch. + +config BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM + bool "custom" + help + Use a custom branch name. + +endchoice + +config BOOTLINUX_TREE_CEL_LINUX_REF + string + default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_REF_NEXT + default "nfsd-fixed" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES + default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM + +endif # !HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFS
workflows/linux/refs/default/Kconfig.jlayton-linux new file +32 -0
@@ -0,0 +1,32 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 +# Automatically generated file + +if !HAVE_BOOTLINUX_TREE_JLAYTON_LINUX_USER_REFS + +choice + prompt "Tag or branch to use" + +config BOOTLINUX_TREE_JLAYTON_LINUX_REF_KDEVOPS + bool "kdevops" + help + Use the latest kdevops branch. + +config BOOTLINUX_TREE_JLAYTON_LINUX_REF_IVERSION + bool "iversion-next" + help + Use the iversion-next branch. + +config BOOTLINUX_TREE_JLAYTON_LINUX_REF_CUSTOM + bool "custom" + help + Use a custom branch name. + +endchoice + +config BOOTLINUX_TREE_JLAYTON_LINUX_REF + string + default "kdevops" if BOOTLINUX_TREE_JLAYTON_LINUX_REF_KDEVOPS + default "iversion-next" if BOOTLINUX_TREE_JLAYTON_LINUX_REF_IVERSION + default BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_JLAYTON_LINUX_REF_CUSTOM + +endif # !HAVE_BOOTLINUX_TREE_JLAYTON_LINUX_USER_REFS
workflows/linux/refs/default/Kconfig.kdevops-linus new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 +# Automatically generated file + +if !HAVE_BOOTLINUX_TREE_KDEVOPS_LINUS_USER_REFS + +choice + prompt "Tag or branch to use" + +config BOOTLINUX_TREE_KDEVOPS_LINUS_REF_LBS_MINORDER + bool "large-block-minorder" + help + Use the latest LBS branch based on Linus's tree + +endchoice + +config BOOTLINUX_TREE_KDEVOPS_LINUS_REF + string + default "large-block-minorder" if BOOTLINUX_TREE_KDEVOPS_LINUS_REF_LBS_MINORDER + +endif # !HAVE_BOOTLINUX_TREE_KDEVOPS_LINUS_USER_REFS
workflows/linux/refs/default/Kconfig.mcgrof-linus new file +26 -0
@@ -0,0 +1,26 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 +# Automatically generated file + +if !HAVE_BOOTLINUX_TREE_MCGROF_LINUS_USER_REFS + +choice + prompt "Tag or branch to use" + +config BOOTLINUX_TREE_MCGROF_LINUS_REF_LBS + bool "large-block-linus" + help + Use the latest LBS branch based on Linus' tree. + +config BOOTLINUX_TREE_MCGROF_LINUS_REF_LBS_NOBDEV + bool "large-block-linus-nobdev" + help + Use the latest minimal branch for LBS which let's you use LBS devices with a sectorsize compatibility based on Linus' tree. + +endchoice + +config BOOTLINUX_TREE_MCGROF_LINUS_REF + string + default "large-block-linus" if BOOTLINUX_TREE_MCGROF_LINUS_REF_LBS + default "large-block-linus-nobdev" if BOOTLINUX_TREE_MCGROF_LINUS_REF_LBS_NOBDEV + +endif # !HAVE_BOOTLINUX_TREE_MCGROF_LINUS_USER_REFS
workflows/linux/refs/default/Kconfig.mcgrof-next new file +26 -0
@@ -0,0 +1,26 @@ +# SPDX-License-Identifier: copyleft-next-0.3.1 +# Automatically generated file + +if !HAVE_BOOTLINUX_TREE_MCGROF_NEXT_USER_REFS + +choice + prompt "Tag or branch to use" + +config BOOTLINUX_TREE_MCGROF_NEXT_REF_LBS + bool "large-block-next" + help + Use the latest stable LBS branch which enables all the bells and whistles for all types of LBS devices. + +config BOOTLINUX_TREE_MCGROF_NEXT_REF_LBS_NOBDEV + bool "large-block-nobdev" + help + Use the latest minimal branch for LBS which let's you use LBS devices with a sectorsize compatibility + +endchoice + +config BOOTLINUX_TREE_MCGROF_NEXT_REF + string + default "large-block-next" if BOOTLINUX_TREE_MCGROF_NEXT_REF_LBS + default "large-block-nobdev" if BOOTLINUX_TREE_MCGROF_NEXT_REF_LBS_NOBDEV + +endif # !HAVE_BOOTLINUX_TREE_MCGROF_NEXT_USER_REFS
workflows/linux/refs/static/btrfs-devel.yaml new file +6 -0
@@ -0,0 +1,6 @@ +--- +configs: + - btrfs-devel: + config: BOOTLINUX_TREE_BTRFS_DEVEL_REF_BTRFSDEVEL + ref: "btrfs-devel" + help: "Use development branch."
workflows/linux/refs/static/cel-linux.yaml new file +14 -0
@@ -0,0 +1,14 @@ +--- +configs: + - next: + config: BOOTLINUX_TREE_CEL_LINUX_REF_NEXT + ref: "nfsd-next" + help: "Pull the nfsd-next branch." + - fixes: + config: BOOTLINUX_TREE_CEL_LINUX_REF_FIXES + ref: "nfsd-fixed" + help: "Pull the nfsd-fixed branch." + - custom: + config: BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM + ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME + help: "Use a custom branch name."
workflows/linux/refs/static/jlayton-linux.yaml new file +14 -0
@@ -0,0 +1,14 @@ +--- +configs: + - kdevops: + config: BOOTLINUX_TREE_JLAYTON_LINUX_REF_KDEVOPS + ref: "kdevops" + help: "Use the latest kdevops branch." + - iversion: + config: BOOTLINUX_TREE_JLAYTON_LINUX_REF_IVERSION + ref: "iversion-next" + help: "Use the iversion-next branch." + - custom: + config: BOOTLINUX_TREE_JLAYTON_LINUX_REF_CUSTOM + ref: BOOTLINUX_TREE_JLAYTON_LINUX_CUSTOM_REF_NAME + help: "Use a custom branch name."
workflows/linux/refs/static/kdevops-linus.yaml new file +6 -0
@@ -0,0 +1,6 @@ +--- +configs: + - minorder: + config: BOOTLINUX_TREE_KDEVOPS_LINUS_REF_LBS_MINORDER + ref: "large-block-minorder" + help: "Use the latest LBS branch based on Linus's tree"
workflows/linux/refs/static/linus.yaml new file +38 -0
@@ -0,0 +1,38 @@ +--- +configs: + - master: + config: BOOTLINUX_TREE_LINUS_REF_MASTER + ref: "master" + help: "master" + - v6.6-rc2: + config: BOOTLINUX_TREE_LINUS_REF_66_RC2 + ref: "v6.6-rc2" + help: "v6.6-rc2" + - v6.6-rc4: + config: BOOTLINUX_TREE_LINUS_REF_66_RC4 + ref: "v6.6-rc4" + help: "v6.6-rc4" + - v6.6-rc5: + config: BOOTLINUX_TREE_LINUS_REF_66_RC5 + ref: "v6.6-rc5" + help: "v6.6-rc5" + - v6.8-rc2: + config: BOOTLINUX_TREE_LINUS_REF_68_RC2 + ref: "v6.8-rc2" + help: "v6.8-rc2" + - v6.9-rc2: + config: BOOTLINUX_TREE_LINUS_REF_69_RC2 + ref: "v6.9-rc2" + help: "v6.9-rc2" + - v6.9-rc4: + config: BOOTLINUX_TREE_LINUS_REF_69_RC4 + ref: "v6.9-rc4" + help: "v6.9-rc4" + - v6.9-rc5: + config: BOOTLINUX_TREE_LINUS_REF_69_RC5 + ref: "v6.9-rc5" + help: "v6.9-rc5" + - v6.9-rc6: + config: BOOTLINUX_TREE_LINUS_REF_69_RC6 + ref: "v6.9-rc6" + help: "v6.9-rc6"
workflows/linux/refs/static/mcgrof-linus.yaml new file +10 -0
@@ -0,0 +1,10 @@ +--- +configs: + - lbs: + config: BOOTLINUX_TREE_MCGROF_LINUS_REF_LBS + ref: "large-block-linus" + help: "Use the latest LBS branch based on Linus' tree." + - lbs-nodeb: + config: BOOTLINUX_TREE_MCGROF_LINUS_REF_LBS_NOBDEV + ref: "large-block-linus-nobdev" + help: "Use the latest minimal branch for LBS which let's you use LBS devices with a sectorsize compatibility based on Linus' tree."
workflows/linux/refs/static/mcgrof-next.yaml new file +10 -0
@@ -0,0 +1,10 @@ +--- +configs: + - lbs: + config: BOOTLINUX_TREE_MCGROF_NEXT_REF_LBS + ref: "large-block-next" + help: "Use the latest stable LBS branch which enables all the bells and whistles for all types of LBS devices." + - lbs-nobdev: + config: BOOTLINUX_TREE_MCGROF_NEXT_REF_LBS_NOBDEV + ref: "large-block-nobdev" + help: "Use the latest minimal branch for LBS which let's you use LBS devices with a sectorsize compatibility"
workflows/linux/refs/static/next.yaml new file +6 -0
@@ -0,0 +1,6 @@ +--- +configs: + - next-20240424: + config: BOOTLINUX_TREE_NEXT_REF_20240424 + ref: "next-20240424" + help: "next-20240424"
workflows/linux/refs/static/stable.yaml new file +38 -0
@@ -0,0 +1,38 @@ +--- +configs: + - v4.19.133: + config: BOOTLINUX_TREE_STABLE_REF_419133 + ref: "v4.19.133" + help: "v4.19.133" + - v5.4.210: + config: BOOTLINUX_TREE_STABLE_REF_54210 + ref: "v5.4.210" + help: "v5.4.210" + - v5.10.105: + config: BOOTLINUX_TREE_STABLE_REF_510105 + ref: "v5.10.105" + help: "v5.10.105" + - v5.14.4: + config: BOOTLINUX_TREE_STABLE_REF_5144 + ref: "v5.14.4" + help: "v5.14.4" + - v5.17-rc7: + config: BOOTLINUX_TREE_STABLE_REF_517RC7 + ref: "v5.17-rc7" + help: "v5.17-rc7" + - v5.19-rc4: + config: BOOTLINUX_TREE_STABLE_REF_519RC4 + ref: "v5.19-rc4" + help: "v5.19-rc4" + - v6.0.9: + config: BOOTLINUX_TREE_STABLE_REF_609 + ref: "v6.0.9" + help: "v6.0.9" + - linux-6.1.y: + config: BOOTLINUX_TREE_STABLE_REF_LINUX61Y + ref: "linux-6.1.y" + help: "linux-6.1.y" + - linux-6.6.y: + config: BOOTLINUX_TREE_STABLE_REF_LINUX66Y + ref: "linux-6.6.y" + help: "linux-6.6.y"
Signature · 1 line
2.43.0
PATCH v5 3/3 linux: add fs-current and fs-next configs
In reply to Daniel GomezAdd fs-current and fs-next new branches for the linux next integration branch.
--- workflows/linux/refs/static/next.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
workflows/linux/refs/static/next.yaml +8 -0
@@ -4,3 +4,11 @@ configs: config: BOOTLINUX_TREE_NEXT_REF_20240424 ref: "next-20240424" help: "next-20240424" + - fs-current: + config: BOOTLINUX_TREE_NEXT_REF_FSCURRENT + ref: "fs-current" + help: "fs-current" + - fs-next: + config: BOOTLINUX_TREE_NEXT_REF_FSNEXT + ref: "fs-next" + help: "fs-next"
Signature · 1 line
2.43.0
Quoted 10 lines · Daniel Gomez
This adds support to generate git references automatically using
make menuconfig,make refs-defaultandmake refs-user.With these targets, we can switch between Default and User Git Reference Modes to generate different lists of references. Default mode uses static references for the Development trees,
kernel.org/releases.json, and static references for Linus, Next, and Stable trees. User mode generates the last 15 references for all trees, including the static references.
Quoted 3 lines
Please, read the
docs/kdevops-autorefs.mdfrom the second patch for a more detailed workflow explanation. And send me any questions if clarification is needed.
This is bad ass!
Luis
Quoted 34 lines · Daniel Gomez
This adds support to generate git references automatically using
make menuconfig,make refs-defaultandmake refs-user.With these targets, we can switch between Default and User Git Reference Modes to generate different lists of references. Default mode uses static references for the Development trees,
kernel.org/releases.json, and static references for Linus, Next, and Stable trees. User mode generates the last 15 references for all trees, including the static references.Please, read the
docs/kdevops-autorefs.mdfrom the second patch for a more detailed workflow explanation. And send me any questions if clarification is needed.With so many changes in version 4, I decided to copy the questions from Luis in version 3.
Luis:
2) The expected day to do is not clear from the commit log. What aspects of no-use of this will generate a 'git diff' visible output if one does not use 'make dynconfig'?None in a normal workflow. But in reality, only when updating the static references in the Development trees YAML file and running 'make refs-user'. The developer should send a patch upstream.
Note that 'make dynconfig' integration is dropped in this version in favor of the new targets 'refs-user' and 'refs-default'.
What aspects will generate a diff which
*should* be commited to the tree, ie how are kdevops developers expected to contribute to say a new revision of Linus' bump of a new rc candidate? The same applies to their git trees.
Quoted 5 lines
Only when updating the static references in the Development trees YAML file and running 'make refs-user'. The developer should send a patch upstream with the new YAML content as well as the autogenerate file. This does not apply to the Linux, Next and Stable trees as they are all the time generated with
make menuconfigandmake refs-default.
Applied and pushed!
Luis