Skip to contentSkip to conversation

Add defaults refs for linux-stable-rc

PATCH In review [email protected] 4 participants 8 messages Mar 13, 2025 – Mar 14, 2025 Kbuild

lore
Share & tools
lore
#0 lore raw

v2 cover Add defaults refs for linux-stable-rc

From: Chuck Lever <[email protected]>

This series goes with the addition of linux-stable-rc to the set of repos handled by the local /mirror.

Changes since RFC:
- Follow suggestions from Daniel Gomez
- Squash in typo fixes

Chuck Lever (2):
linux-mirror: Enable choice of clone protocol for stable-rc tree Add the stable release candidate repo to the Linux git repos menu

 Makefile.linux-mirror                         |  1 +
 kconfigs/Kconfig.defaults                     | 12 ++++
 kconfigs/Kconfig.mirror                       | 41 ++++++++++++++
 kconfigs/workflows/Kconfig.bootlinux          |  4 ++
 scripts/gen-refs-default.Makefile             |  4 +-
 scripts/gen-refs-user.Makefile                | 20 ++++++-
 workflows/linux/Kconfig                       |  9 +++
 workflows/linux/Kconfig.stable_rc             | 31 ++++++++++
 .../linux/refs/default/Kconfig.stable_rc      | 56 +++++++++++++++++++
 workflows/linux/refs/static/stable_rc.yaml    | 30 ++++++++++
 10 files changed, 203 insertions(+), 5 deletions(-)
 create mode 100644 workflows/linux/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/default/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/static/stable_rc.yaml
Signature · 1 line
2.48.1
#1 lore raw

PATCH v2 1/2 linux-mirror: Enable choice of clone protocol for stable-rc tree

From: Chuck Lever <[email protected]>

Add linux-stable-rc to the "Install local mirror setup" menu so that users can select which default protocol and master to pull from.

---
 Makefile.linux-mirror     |  1 +
 kconfigs/Kconfig.defaults | 12 ++++++++++++
 kconfigs/Kconfig.mirror   | 41 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
Makefile.linux-mirror +1 -0
index e2a4b4dcb3ae..2ff18adfda1a 100644
@@ -17,6 +17,7 @@ LINUX_MIRROR_ARGS += mirror_qemu_jic23_url='$(subst ",,$(CONFIG_MIRROR_KDEVOPS_U
 LINUX_MIRROR_ARGS += mirror_mcgrof_linus_url='$(subst ",,$(CONFIG_MIRROR_MCGROF_LINUS_URL))'
 LINUX_MIRROR_ARGS += mirror_mcgrof_url='$(subst ",,$(CONFIG_MIRROR_MCGROF_URL))'
 LINUX_MIRROR_ARGS += mirror_stable_url='$(subst ",,$(CONFIG_MIRROR_STABLE_URL))'
+LINUX_MIRROR_ARGS += mirror_stable_rc_url='$(subst ",,$(CONFIG_MIRROR_STABLE_RC_URL))'
 LINUX_MIRROR_ARGS += mirror_torvalds_url='$(subst ",,$(CONFIG_MIRROR_TORVALDS_URL))'
 endif
 
kconfigs/Kconfig.defaults +12 -0
index 9e6da24f2921..e03f17872850 100644
@@ -164,6 +164,18 @@ config DEFAULT_STABLE_HTTPS_GOOGLE_URL
 	string
 	default "https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git"
 
+config DEFAULT_STABLE_RC_GIT_URL
+	string
+	default "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
+
+config DEFAULT_STABLE_RC_HTTPS_URL
+	string
+	default "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
+
+config DEFAULT_STABLE_RC_HTTPS_GOOGLE_URL
+	string
+	default "https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
+
 config DEFAULT_VFS_GIT_URL
 	string
 	default "git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git"
kconfigs/Kconfig.mirror +41 -0

47 lines not on this page · raw message

Signature · 1 line
2.48.1
#2 lore raw

PATCH v2 2/2 Add the stable release candidate repo to the Linux git repos menu

In reply to [email protected]

From: Chuck Lever <[email protected]>

I have several nightly test runners that pull LTS release candidates for testing. I have to hand-edit the Kconfig for each test runner when switching from the master repo to a local mirror.

I would like to get those to switch automatically over to using a local mirror, when one is available.

---
 kconfigs/workflows/Kconfig.bootlinux          |  4 ++
 scripts/gen-refs-default.Makefile             |  4 +-
 scripts/gen-refs-user.Makefile                | 20 ++++++-
 workflows/linux/Kconfig                       |  9 +++
 workflows/linux/Kconfig.stable_rc             | 31 ++++++++++
 .../linux/refs/default/Kconfig.stable_rc      | 56 +++++++++++++++++++
 workflows/linux/refs/static/stable_rc.yaml    | 30 ++++++++++
 7 files changed, 149 insertions(+), 5 deletions(-)
 create mode 100644 workflows/linux/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/default/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/static/stable_rc.yaml
kconfigs/workflows/Kconfig.bootlinux +4 -0
index 25bbe4ea7e47..a66e44ee8cb7 100644
@@ -12,6 +12,10 @@ 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_STABLE_RC_USER_REFS
+	bool
+	default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.stable_rc)
+
 config HAVE_BOOTLINUX_TREE_MCGROF_LINUS_USER_REFS
 	bool
 	default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.mcgrof-linus)
scripts/gen-refs-default.Makefile +2 -2
index c5d12e152cb4..0ef1d67cbfd3 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: copyleft-next-0.3.1
 
-REF_DEF_OBJS := $(addprefix $(TOPDIR)/workflows/linux/refs/default/, Kconfig.linus Kconfig.next Kconfig.stable)
-REF_DEF_SRC  := $(addprefix $(TOPDIR)/workflows/linux/refs/static/,  linus.yaml next.yaml stable.yaml)
+REF_DEF_OBJS := $(addprefix $(TOPDIR)/workflows/linux/refs/default/, Kconfig.linus Kconfig.next Kconfig.stable Kconfig.stable_rc)
+REF_DEF_SRC  := $(addprefix $(TOPDIR)/workflows/linux/refs/static/,  linus.yaml next.yaml stable.yaml stable_rc.yaml)
 
 KRELEASES_FORCE := $(if $(filter --force,$(KRELEASES_FORCE)),--force,)
 
scripts/gen-refs-user.Makefile +17 -3
index 5c5df2f5417e..ab2e622f0234 100644
@@ -3,6 +3,7 @@
 SRC_URI_HTTPS_LINUS = https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 SRC_URI_HTTPS_NEXT = https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
 SRC_URI_HTTPS_STABLE = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+SRC_URI_HTTPS_STABLE_RC = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
 
 SRC_URI_HTTPS_MCGROF_LINUS = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git
 SRC_URI_HTTPS_MCGROF_NEXT = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git
@@ -17,6 +18,7 @@ SRC_URI_HTTPS_XFS = https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 REFS_TARGET_LINUS := gen_refs_linus
 REFS_TARGET_NEXT := gen_refs_next
 REFS_TARGET_STABLE := gen_refs_stable
+REFS_TARGET_STABLE_RC := gen_refs_stable_rc
 
 REFS_TARGET_DEVELOPMENT := gen_refs_mcgrof_linus
 REFS_TARGET_DEVELOPMENT += gen_refs_mcgrof_next
@@ -68,6 +70,18 @@ gen_refs_stable:
 		--repo $(SRC_URI_HTTPS_STABLE) \
 		--refs $(REFS_COUNT)
 
+PHONY += gen_refs_stable_rc
+gen_refs_stable_rc:
+	$(Q)$(E) "Generating refs/$(REFS_DIR)/Kconfig.$(subst _,-,$(patsubst gen_refs_%,%,$@)) ($(REFS_COUNT) refs)..."
+	$(Q)./scripts/generate_refs.py \
+		--prefix BOOTLINUX_TREE_STABLE_RC \
+		--output workflows/linux/refs/$(REFS_DIR)/Kconfig.stable_rc \
+		--extra workflows/linux/refs/static/stable_rc.yaml \
+		--force \
+		gitref \
+		--repo $(SRC_URI_HTTPS_STABLE_RC) \
+		--refs $(REFS_COUNT)
+
 PHONY += gen_refs_mcgrof_linus
 gen_refs_mcgrof_linus:
 	$(Q)$(E) "Generating refs/$(REFS_DIR)/Kconfig.$(subst _,-,$(patsubst gen_refs_%,%,$@)) ($(REFS_COUNT) refs)..."
@@ -183,14 +197,14 @@ refs-user-clean:
 	fi
 
 _gen-user-refs:
-	$(Q)$(E) "Generating refs/user/Kconfig.{linus,next,stable,mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
-	$(Q)$(MAKE) REFS_COUNT=15 REFS_DIR="user" $(REFS_TARGET_LINUS) $(REFS_TARGET_NEXT) $(REFS_TARGET_STABLE) $(REFS_TARGET_DEVELOPMENT)
+	$(Q)$(E) "Generating refs/user/Kconfig.{linus,next,stable,stable_rc,mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux,jlayton-linux,kdevops-linus} files..."
+	$(Q)$(MAKE) REFS_COUNT=15 REFS_DIR="user" $(REFS_TARGET_LINUS) $(REFS_TARGET_NEXT) $(REFS_TARGET_STABLE) $(REFS_TARGET_STABLE_RC) $(REFS_TARGET_DEVELOPMENT)
 
 PHONY += refs-user
 refs-user: _gen-user-refs
 
 _gen-default-refs-development:
-	$(Q)$(E) "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
+	$(Q)$(E) "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux,jlayton-linux,kdevops-linus,stable_rc} files..."
 	$(Q)$(MAKE) REFS_COUNT=0 REFS_DIR="default" $(REFS_TARGET_DEVELOPMENT)
 
 .PHONY: $(PHONY)
workflows/linux/Kconfig +9 -0
index 6b496c56c762..8c4de4cc8ee2 100644
@@ -126,6 +126,11 @@ config BOOTLINUX_STABLE
 	help
 	  This will let you choose from stable Linux trees only.
 
+config BOOTLINUX_STABLE_RC
+	bool "Stable Linux release candidates"
+	help
+	  This will let you choose from stable Linux release candidates only.
+
 config BOOTLINUX_DEV
 	bool "Development Linux releases"
 	help
@@ -141,6 +146,7 @@ endchoice
 
 source "workflows/linux/Kconfig.linus"
 source "workflows/linux/Kconfig.stable"
+source "workflows/linux/Kconfig.stable_rc"
 source "workflows/linux/Kconfig.dev"
 source "workflows/linux/Kconfig.modules"
 source "workflows/linux/Kconfig.next"
@@ -185,6 +191,7 @@ config BOOTLINUX_TREE_NAME
 	string
 	default BOOTLINUX_TREE_LINUS_NAME if BOOTLINUX_TREE_LINUS
 	default BOOTLINUX_TREE_STABLE_NAME if BOOTLINUX_TREE_STABLE
+	default BOOTLINUX_TREE_STABLE_RC_NAME if BOOTLINUX_TREE_STABLE_RC
 	default BOOTLINUX_TREE_NEXT_NAME if BOOTLINUX_TREE_NEXT
 	default BOOTLINUX_TREE_BTRFS_DEVEL_NAME if BOOTLINUX_TREE_BTRFS_DEVEL
 	default BOOTLINUX_TREE_KDEVOPS_NAME if BOOTLINUX_TREE_KDEVOPS_LINUS
@@ -200,6 +207,7 @@ config BOOTLINUX_TREE
 	string
 	default BOOTLINUX_TREE_LINUS_URL if BOOTLINUX_TREE_LINUS
 	default BOOTLINUX_TREE_STABLE_URL if BOOTLINUX_TREE_STABLE
+	default BOOTLINUX_TREE_STABLE_RC_URL if BOOTLINUX_TREE_STABLE_RC
 	default BOOTLINUX_TREE_NEXT_URL if BOOTLINUX_TREE_NEXT
 	default BOOTLINUX_TREE_MCGROF_URL if BOOTLINUX_TREE_MCGROF
 	default BOOTLINUX_TREE_MODULES_URL if BOOTLINUX_TREE_MODULES
@@ -248,6 +256,7 @@ config BOOTLINUX_TREE_REF
 	string
 	default BOOTLINUX_TREE_LINUS_REF if BOOTLINUX_TREE_LINUS
 	default BOOTLINUX_TREE_STABLE_REF if BOOTLINUX_STABLE
+	default BOOTLINUX_TREE_STABLE_RC_REF if BOOTLINUX_STABLE_RC
 	default BOOTLINUX_TREE_NEXT_REF if BOOTLINUX_TREE_NEXT
 	default BOOTLINUX_TREE_VFS_REF if BOOTLINUX_TREE_VFS
 	default BOOTLINUX_TREE_XFS_REF if BOOTLINUX_TREE_XFS
workflows/linux/Kconfig.stable_rc new file +31 -0
new file mode 100644
index 000000000000..8bcb7a2fba61
@@ -0,0 +1,31 @@
+if BOOTLINUX_STABLE_RC
+
+choice
+	prompt "Linux stable release candidate tree to use"
+	default BOOTLINUX_TREE_STABLE_RC
+
+config BOOTLINUX_TREE_STABLE_RC
+	bool "linux-stable-rc"
+	help
+	  Use the linux-stable release candidate tree.
+
+endchoice
+
+if BOOTLINUX_TREE_STABLE_RC
+
+source "workflows/linux/refs/default/Kconfig.stable_rc"
+source "workflows/linux/refs/user/Kconfig.stable_rc"
+
+endif # BOOTLINUX_TREE_STABLE_RC
+
+config BOOTLINUX_TREE_STABLE_RC_NAME
+	string
+	default "linux-stable-rc" if BOOTLINUX_TREE_STABLE_RC
+
+config BOOTLINUX_TREE_STABLE_RC_URL
+	string
+	default DEFAULT_STABLE_RC_HTTPS_URL if !USE_LOCAL_LINUX_MIRROR
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux-stable-rc.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
+	default "/mirror/linux-stable-rc.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
+
+endif # BOOTLINUX_STABLE_RC
workflows/linux/refs/default/Kconfig.stable_rc new file +56 -0

56 lines not on this page · raw message

workflows/linux/refs/static/stable_rc.yaml new file +30 -0
new file mode 100644
index 000000000000..a7d82977a04a
@@ -0,0 +1,30 @@
+---
+configs:
+  - queue-5.4:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_54
+    ref: "queue/5.4"
+    help: "Pull the queue/5.4 branch."
+  - queue-5.10:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_510
+    ref: "queue/5.10"
+    help: "Pull the queue/5.10 branch."
+  - queue-5.15:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_515
+    ref: "queue/5.15"
+    help: "Pull the queue/5.15 branch."
+  - queue-6.1:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_61
+    ref: "queue/6.1"
+    help: "Pull the queue/6.1 branch."
+  - queue-6.6:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
+    ref: "queue/6.6"
+    help: "Pull the queue/6.6 branch."
+  - queue-6.12:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
+    ref: "queue/6.12"
+    help: "Pull the queue/6.12 branch."
+  - queue-6.13:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
+    ref: "queue/6.13"
+    help: "Pull the queue/6.13 branch."
Signature · 1 line
2.48.1
#3 lore raw

Re: [PATCH v2 2/2] Add the stable release candidate repo to the Linux git repos menu

In reply to [email protected]
Quoted 43 lines · On Thu, Mar 13, 2025 at 05:00:10PM +0100, [email protected] wrote:

From: Chuck Lever <[email protected]>

I have several nightly test runners that pull LTS release candidates for testing. I have to hand-edit the Kconfig for each test runner when switching from the master repo to a local mirror.

I would like to get those to switch automatically over to using a local mirror, when one is available.

---
 kconfigs/workflows/Kconfig.bootlinux          |  4 ++
 scripts/gen-refs-default.Makefile             |  4 +-
 scripts/gen-refs-user.Makefile                | 20 ++++++-
 workflows/linux/Kconfig                       |  9 +++
 workflows/linux/Kconfig.stable_rc             | 31 ++++++++++
 .../linux/refs/default/Kconfig.stable_rc      | 56 +++++++++++++++++++
 workflows/linux/refs/static/stable_rc.yaml    | 30 ++++++++++
 7 files changed, 149 insertions(+), 5 deletions(-)
 create mode 100644 workflows/linux/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/default/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/static/stable_rc.yaml
kconfigs/workflows/Kconfig.bootlinux +4 -0
index 25bbe4ea7e47..a66e44ee8cb7 100644
@@ -12,6 +12,10 @@ 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_STABLE_RC_USER_REFS
+	bool
+	default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.stable_rc)
+
 config HAVE_BOOTLINUX_TREE_MCGROF_LINUS_USER_REFS
 	bool
 	default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.mcgrof-linus)
scripts/gen-refs-default.Makefile +0 -0
index c5d12e152cb4..0ef1d67cbfd3 100644

scripts/gen-refs-default.Makefile line 4

Quoted 6 lines
scripts/gen-refs-default.Makefile +2 -2
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: copyleft-next-0.3.1
 
-REF_DEF_OBJS := $(addprefix $(TOPDIR)/workflows/linux/refs/default/, Kconfig.linus Kconfig.next Kconfig.stable)
-REF_DEF_SRC  := $(addprefix $(TOPDIR)/workflows/linux/refs/static/,  linus.yaml next.yaml stable.yaml)
+REF_DEF_OBJS := $(addprefix $(TOPDIR)/workflows/linux/refs/default/, Kconfig.linus Kconfig.next Kconfig.stable Kconfig.stable_rc)
+REF_DEF_SRC  := $(addprefix $(TOPDIR)/workflows/linux/refs/static/,  linus.yaml next.yaml stable.yaml stable_rc.yaml)

We don't need this part because stable_rc is not part of the kreleases targets defined in this Makefile. It won't find it actually.

scripts/gen-refs-user.Makefile line 6

Quoted 12 lines
scripts/gen-refs-default.Makefile +0 -0
 KRELEASES_FORCE := $(if $(filter --force,$(KRELEASES_FORCE)),--force,)
 
scripts/gen-refs-user.Makefile +1 -0
index 5c5df2f5417e..ab2e622f0234 100644
@@ -3,6 +3,7 @@
 SRC_URI_HTTPS_LINUS = https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 SRC_URI_HTTPS_NEXT = https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
 SRC_URI_HTTPS_STABLE = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+SRC_URI_HTTPS_STABLE_RC = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git

I consider stable_rc part of the development trees. Linus, Next and Stable trees are separated as they are kernel.org official release trees and therefore we can use the https://www.kernel.org/releases.json (kreleases in generate_refs.py script). I think this fits better with the development trees list just below this one. This is minor detail to organize things here and below.

scripts/gen-refs-user.Makefile SRC_URI_HTTPS_XFS = https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git · line 21

Quoted 8 lines
scripts/gen-refs-user.Makefile +1 -0
 SRC_URI_HTTPS_MCGROF_LINUS = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git
 SRC_URI_HTTPS_MCGROF_NEXT = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git
@@ -17,6 +18,7 @@ SRC_URI_HTTPS_XFS = https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 REFS_TARGET_LINUS := gen_refs_linus
 REFS_TARGET_NEXT := gen_refs_next
 REFS_TARGET_STABLE := gen_refs_stable
+REFS_TARGET_STABLE_RC := gen_refs_stable_rc

We want this as part of REFS_TARGET_DEVELOPMENT because of reasoning above.

Quoted 226 lines
scripts/gen-refs-user.Makefile +15 -3
 REFS_TARGET_DEVELOPMENT := gen_refs_mcgrof_linus
 REFS_TARGET_DEVELOPMENT += gen_refs_mcgrof_next
@@ -68,6 +70,18 @@ gen_refs_stable:
 		--repo $(SRC_URI_HTTPS_STABLE) \
 		--refs $(REFS_COUNT)
 
+PHONY += gen_refs_stable_rc
+gen_refs_stable_rc:
+	$(Q)$(E) "Generating refs/$(REFS_DIR)/Kconfig.$(subst _,-,$(patsubst gen_refs_%,%,$@)) ($(REFS_COUNT) refs)..."
+	$(Q)./scripts/generate_refs.py \
+		--prefix BOOTLINUX_TREE_STABLE_RC \
+		--output workflows/linux/refs/$(REFS_DIR)/Kconfig.stable_rc \
+		--extra workflows/linux/refs/static/stable_rc.yaml \
+		--force \
+		gitref \
+		--repo $(SRC_URI_HTTPS_STABLE_RC) \
+		--refs $(REFS_COUNT)
+
 PHONY += gen_refs_mcgrof_linus
 gen_refs_mcgrof_linus:
 	$(Q)$(E) "Generating refs/$(REFS_DIR)/Kconfig.$(subst _,-,$(patsubst gen_refs_%,%,$@)) ($(REFS_COUNT) refs)..."
@@ -183,14 +197,14 @@ refs-user-clean:
 	fi
 
 _gen-user-refs:
-	$(Q)$(E) "Generating refs/user/Kconfig.{linus,next,stable,mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
-	$(Q)$(MAKE) REFS_COUNT=15 REFS_DIR="user" $(REFS_TARGET_LINUS) $(REFS_TARGET_NEXT) $(REFS_TARGET_STABLE) $(REFS_TARGET_DEVELOPMENT)
+	$(Q)$(E) "Generating refs/user/Kconfig.{linus,next,stable,stable_rc,mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux,jlayton-linux,kdevops-linus} files..."
+	$(Q)$(MAKE) REFS_COUNT=15 REFS_DIR="user" $(REFS_TARGET_LINUS) $(REFS_TARGET_NEXT) $(REFS_TARGET_STABLE) $(REFS_TARGET_STABLE_RC) $(REFS_TARGET_DEVELOPMENT)
 
 PHONY += refs-user
 refs-user: _gen-user-refs
 
 _gen-default-refs-development:
-	$(Q)$(E) "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
+	$(Q)$(E) "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux,jlayton-linux,kdevops-linus,stable_rc} files..."
 	$(Q)$(MAKE) REFS_COUNT=0 REFS_DIR="default" $(REFS_TARGET_DEVELOPMENT)
 
 .PHONY: $(PHONY)
workflows/linux/Kconfig +9 -0
index 6b496c56c762..8c4de4cc8ee2 100644
@@ -126,6 +126,11 @@ config BOOTLINUX_STABLE
 	help
 	  This will let you choose from stable Linux trees only.
 
+config BOOTLINUX_STABLE_RC
+	bool "Stable Linux release candidates"
+	help
+	  This will let you choose from stable Linux release candidates only.
+
 config BOOTLINUX_DEV
 	bool "Development Linux releases"
 	help
@@ -141,6 +146,7 @@ endchoice
 
 source "workflows/linux/Kconfig.linus"
 source "workflows/linux/Kconfig.stable"
+source "workflows/linux/Kconfig.stable_rc"
 source "workflows/linux/Kconfig.dev"
 source "workflows/linux/Kconfig.modules"
 source "workflows/linux/Kconfig.next"
@@ -185,6 +191,7 @@ config BOOTLINUX_TREE_NAME
 	string
 	default BOOTLINUX_TREE_LINUS_NAME if BOOTLINUX_TREE_LINUS
 	default BOOTLINUX_TREE_STABLE_NAME if BOOTLINUX_TREE_STABLE
+	default BOOTLINUX_TREE_STABLE_RC_NAME if BOOTLINUX_TREE_STABLE_RC
 	default BOOTLINUX_TREE_NEXT_NAME if BOOTLINUX_TREE_NEXT
 	default BOOTLINUX_TREE_BTRFS_DEVEL_NAME if BOOTLINUX_TREE_BTRFS_DEVEL
 	default BOOTLINUX_TREE_KDEVOPS_NAME if BOOTLINUX_TREE_KDEVOPS_LINUS
@@ -200,6 +207,7 @@ config BOOTLINUX_TREE
 	string
 	default BOOTLINUX_TREE_LINUS_URL if BOOTLINUX_TREE_LINUS
 	default BOOTLINUX_TREE_STABLE_URL if BOOTLINUX_TREE_STABLE
+	default BOOTLINUX_TREE_STABLE_RC_URL if BOOTLINUX_TREE_STABLE_RC
 	default BOOTLINUX_TREE_NEXT_URL if BOOTLINUX_TREE_NEXT
 	default BOOTLINUX_TREE_MCGROF_URL if BOOTLINUX_TREE_MCGROF
 	default BOOTLINUX_TREE_MODULES_URL if BOOTLINUX_TREE_MODULES
@@ -248,6 +256,7 @@ config BOOTLINUX_TREE_REF
 	string
 	default BOOTLINUX_TREE_LINUS_REF if BOOTLINUX_TREE_LINUS
 	default BOOTLINUX_TREE_STABLE_REF if BOOTLINUX_STABLE
+	default BOOTLINUX_TREE_STABLE_RC_REF if BOOTLINUX_STABLE_RC
 	default BOOTLINUX_TREE_NEXT_REF if BOOTLINUX_TREE_NEXT
 	default BOOTLINUX_TREE_VFS_REF if BOOTLINUX_TREE_VFS
 	default BOOTLINUX_TREE_XFS_REF if BOOTLINUX_TREE_XFS
workflows/linux/Kconfig.stable_rc new file +31 -0
new file mode 100644
index 000000000000..8bcb7a2fba61
@@ -0,0 +1,31 @@
+if BOOTLINUX_STABLE_RC
+
+choice
+	prompt "Linux stable release candidate tree to use"
+	default BOOTLINUX_TREE_STABLE_RC
+
+config BOOTLINUX_TREE_STABLE_RC
+	bool "linux-stable-rc"
+	help
+	  Use the linux-stable release candidate tree.
+
+endchoice
+
+if BOOTLINUX_TREE_STABLE_RC
+
+source "workflows/linux/refs/default/Kconfig.stable_rc"
+source "workflows/linux/refs/user/Kconfig.stable_rc"
+
+endif # BOOTLINUX_TREE_STABLE_RC
+
+config BOOTLINUX_TREE_STABLE_RC_NAME
+	string
+	default "linux-stable-rc" if BOOTLINUX_TREE_STABLE_RC
+
+config BOOTLINUX_TREE_STABLE_RC_URL
+	string
+	default DEFAULT_STABLE_RC_HTTPS_URL if !USE_LOCAL_LINUX_MIRROR
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux-stable-rc.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
+	default "/mirror/linux-stable-rc.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
+
+endif # BOOTLINUX_STABLE_RC
workflows/linux/refs/default/Kconfig.stable_rc new file +56 -0
new file mode 100644
index 000000000000..84495567d280
@@ -0,0 +1,56 @@
+# SPDX-License-Identifier: copyleft-next-0.3.1
+# Automatically generated file
+
+if !HAVE_BOOTLINUX_TREE_STABLE_RC_USER_REFS
+
+choice
+	prompt "Tag or branch to use"
+
+config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_54
+	bool "queue/5.4"
+	help
+	  Pull the queue/5.4 branch.
+
+config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_510
+	bool "queue/5.10"
+	help
+	  Pull the queue/5.10 branch.
+
+config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_515
+	bool "queue/5.15"
+	help
+	  Pull the queue/5.15 branch.
+
+config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_61
+	bool "queue/6.1"
+	help
+	  Pull the queue/6.1 branch.
+
+config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
+	bool "queue/6.6"
+	help
+	  Pull the queue/6.6 branch.
+
+config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
+	bool "queue/6.12"
+	help
+	  Pull the queue/6.12 branch.
+
+config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
+	bool "queue/6.13"
+	help
+	  Pull the queue/6.13 branch.
+
+endchoice
+
+config BOOTLINUX_TREE_STABLE_RC_REF
+	string
+	default "queue/5.4" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_54
+	default "queue/5.10" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_510
+	default "queue/5.15" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_515
+	default "queue/6.1" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_61
+	default "queue/6.6" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
+	default "queue/6.12" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
+	default "queue/6.13" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
+
+endif # !HAVE_BOOTLINUX_TREE_STABLE_RC_USER_REFS
workflows/linux/refs/static/stable_rc.yaml new file +30 -0
new file mode 100644
index 000000000000..a7d82977a04a
@@ -0,0 +1,30 @@
+---
+configs:
+  - queue-5.4:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_54
+    ref: "queue/5.4"
+    help: "Pull the queue/5.4 branch."
+  - queue-5.10:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_510
+    ref: "queue/5.10"
+    help: "Pull the queue/5.10 branch."
+  - queue-5.15:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_515
+    ref: "queue/5.15"
+    help: "Pull the queue/5.15 branch."
+  - queue-6.1:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_61
+    ref: "queue/6.1"
+    help: "Pull the queue/6.1 branch."
+  - queue-6.6:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
+    ref: "queue/6.6"
+    help: "Pull the queue/6.6 branch."
+  - queue-6.12:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
+    ref: "queue/6.12"
+    help: "Pull the queue/6.12 branch."
+  - queue-6.13:
+    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
+    ref: "queue/6.13"
+    help: "Pull the queue/6.13 branch."
Signature · 1 line
2.48.1
Reviewed-by on the v2 series
#5 lore raw
In reply to [email protected]
Quoted 4 lines · On Thu, Mar 13, 2025 at 05:00:08PM +0100, [email protected] wrote:

From: Chuck Lever <[email protected]>

This series goes with the addition of linux-stable-rc to the set of repos handled by the local /mirror.

Besides minor details explained in the other thread, this LGTM:

Quoted 27 lines

Changes since RFC:
- Follow suggestions from Daniel Gomez
- Squash in typo fixes

Chuck Lever (2):
linux-mirror: Enable choice of clone protocol for stable-rc tree Add the stable release candidate repo to the Linux git repos menu

 Makefile.linux-mirror                         |  1 +
 kconfigs/Kconfig.defaults                     | 12 ++++
 kconfigs/Kconfig.mirror                       | 41 ++++++++++++++
 kconfigs/workflows/Kconfig.bootlinux          |  4 ++
 scripts/gen-refs-default.Makefile             |  4 +-
 scripts/gen-refs-user.Makefile                | 20 ++++++-
 workflows/linux/Kconfig                       |  9 +++
 workflows/linux/Kconfig.stable_rc             | 31 ++++++++++
 .../linux/refs/default/Kconfig.stable_rc      | 56 +++++++++++++++++++
 workflows/linux/refs/static/stable_rc.yaml    | 30 ++++++++++
 10 files changed, 203 insertions(+), 5 deletions(-)
 create mode 100644 workflows/linux/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/default/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/static/stable_rc.yaml
Signature · 1 line
2.48.1
#7 lore raw
In reply to Chuck Lever
Quoted 7 lines · Chuck Lever
Quoted 6 lines · Daniel Gomez
Quoted 4 lines · On Thu, Mar 13, 2025 at 05:00:08PM +0100, [email protected] wrote:

From: Chuck Lever <[email protected]>

This series goes with the addition of linux-stable-rc to the set of repos handled by the local /mirror.

Quoted 7 lines
Quoted 3 lines

Besides minor details explained in the other thread, this LGTM:

Thanks for your guidance. I've made the changes you suggested, and reorganized the permanent Kconfig submenus to move the "stable rc" submenu under "Development trees".

Makes sense to change menu ordering, thanks!

I'm thinking your change is worth adding to the documentation as example on how to augment kdevops autorefs. I'll add a section soon for that.

Quoted 34 lines

Pushed.

Quoted 26 lines
Quoted 26 lines

Changes since RFC:
- Follow suggestions from Daniel Gomez
- Squash in typo fixes

Chuck Lever (2):
linux-mirror: Enable choice of clone protocol for stable-rc tree Add the stable release candidate repo to the Linux git repos menu

 Makefile.linux-mirror                         |  1 +
 kconfigs/Kconfig.defaults                     | 12 ++++
 kconfigs/Kconfig.mirror                       | 41 ++++++++++++++
 kconfigs/workflows/Kconfig.bootlinux          |  4 ++
 scripts/gen-refs-default.Makefile             |  4 +-
 scripts/gen-refs-user.Makefile                | 20 ++++++-
 workflows/linux/Kconfig                       |  9 +++
 workflows/linux/Kconfig.stable_rc             | 31 ++++++++++
 .../linux/refs/default/Kconfig.stable_rc      | 56 +++++++++++++++++++
 workflows/linux/refs/static/stable_rc.yaml    | 30 ++++++++++
 10 files changed, 203 insertions(+), 5 deletions(-)
 create mode 100644 workflows/linux/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/default/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/static/stable_rc.yaml
Signature · 1 line
2.48.1
Signature · 1 line
Chuck Lever
#6 lore raw
In reply to Daniel Gomez
Quoted 9 lines · Daniel Gomez
Quoted 4 lines · On Thu, Mar 13, 2025 at 05:00:08PM +0100, [email protected] wrote:

From: Chuck Lever <[email protected]>

This series goes with the addition of linux-stable-rc to the set of repos handled by the local /mirror.

Besides minor details explained in the other thread, this LGTM:

Thanks for your guidance. I've made the changes you suggested, and reorganized the permanent Kconfig submenus to move the "stable rc" submenu under "Development trees".

Pushed.

Quoted 26 lines
Quoted 26 lines

Changes since RFC:
- Follow suggestions from Daniel Gomez
- Squash in typo fixes

Chuck Lever (2):
linux-mirror: Enable choice of clone protocol for stable-rc tree Add the stable release candidate repo to the Linux git repos menu

 Makefile.linux-mirror                         |  1 +
 kconfigs/Kconfig.defaults                     | 12 ++++
 kconfigs/Kconfig.mirror                       | 41 ++++++++++++++
 kconfigs/workflows/Kconfig.bootlinux          |  4 ++
 scripts/gen-refs-default.Makefile             |  4 +-
 scripts/gen-refs-user.Makefile                | 20 ++++++-
 workflows/linux/Kconfig                       |  9 +++
 workflows/linux/Kconfig.stable_rc             | 31 ++++++++++
 .../linux/refs/default/Kconfig.stable_rc      | 56 +++++++++++++++++++
 workflows/linux/refs/static/stable_rc.yaml    | 30 ++++++++++
 10 files changed, 203 insertions(+), 5 deletions(-)
 create mode 100644 workflows/linux/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/default/Kconfig.stable_rc
 create mode 100644 workflows/linux/refs/static/stable_rc.yaml
Signature · 1 line
2.48.1
Signature · 1 line
Chuck Lever