Skip to content

Commit 79f9e24

Browse files
committed
Add the stable release candidate repo to the Linux git repos menu
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. Reviewed-by: Luis Chamberlain <[email protected]> Reviewed-by: Daniel Gomez <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 6c7bc7d commit 79f9e24

File tree

7 files changed

+147
-3
lines changed

7 files changed

+147
-3
lines changed

kconfigs/workflows/Kconfig.bootlinux

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ config HAVE_BOOTLINUX_TREE_STABLE_USER_REFS
1212
bool
1313
default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.stable)
1414

15+
config HAVE_BOOTLINUX_TREE_STABLE_RC_USER_REFS
16+
bool
17+
default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.stable_rc)
18+
1519
config HAVE_BOOTLINUX_TREE_MCGROF_LINUS_USER_REFS
1620
bool
1721
default $(shell, scripts/check_file_empty.sh workflows/linux/refs/user/Kconfig.mcgrof-linus)

scripts/gen-refs-user.Makefile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ SRC_URI_HTTPS_JLAYTON_LINUX = https://git.kernel.org/pub/scm/linux/kernel/git/jl
1313
SRC_URI_HTTPS_KDEVOPS_LINUS = https://github.com/linux-kdevops/linux.git
1414
SRC_URI_HTTPS_VFS = https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
1515
SRC_URI_HTTPS_XFS = https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
16+
SRC_URI_HTTPS_STABLE_RC = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
1617

1718
REFS_TARGET_LINUS := gen_refs_linus
1819
REFS_TARGET_NEXT := gen_refs_next
@@ -27,6 +28,7 @@ REFS_TARGET_DEVELOPMENT += gen_refs_jlayton_linux
2728
REFS_TARGET_DEVELOPMENT += gen_refs_kdevops_linus
2829
REFS_TARGET_DEVELOPMENT += gen_refs_vfs
2930
REFS_TARGET_DEVELOPMENT += gen_refs_xfs
31+
REFS_TARGET_DEVELOPMENT += gen_refs_stable_rc
3032

3133
REFS_COUNT := 15
3234
UREF_EXT ?= uref-
@@ -68,6 +70,18 @@ gen_refs_stable:
6870
--repo $(SRC_URI_HTTPS_STABLE) \
6971
--refs $(REFS_COUNT)
7072

73+
PHONY += gen_refs_stable_rc
74+
gen_refs_stable_rc:
75+
$(Q)$(E) "Generating refs/$(REFS_DIR)/Kconfig.$(subst _,-,$(patsubst gen_refs_%,%,$@)) ($(REFS_COUNT) refs)..."
76+
$(Q)./scripts/generate_refs.py \
77+
--prefix BOOTLINUX_TREE_STABLE_RC \
78+
--output workflows/linux/refs/$(REFS_DIR)/Kconfig.stable_rc \
79+
--extra workflows/linux/refs/static/stable_rc.yaml \
80+
--force \
81+
gitref \
82+
--repo $(SRC_URI_HTTPS_STABLE_RC) \
83+
--refs $(REFS_COUNT)
84+
7185
PHONY += gen_refs_mcgrof_linus
7286
gen_refs_mcgrof_linus:
7387
$(Q)$(E) "Generating refs/$(REFS_DIR)/Kconfig.$(subst _,-,$(patsubst gen_refs_%,%,$@)) ($(REFS_COUNT) refs)..."
@@ -183,14 +197,14 @@ refs-user-clean:
183197
fi
184198

185199
_gen-user-refs:
186-
$(Q)$(E) "Generating refs/user/Kconfig.{linus,next,stable,mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
187-
$(Q)$(MAKE) REFS_COUNT=15 REFS_DIR="user" $(REFS_TARGET_LINUS) $(REFS_TARGET_NEXT) $(REFS_TARGET_STABLE) $(REFS_TARGET_DEVELOPMENT)
200+
$(Q)$(E) "Generating refs/user/Kconfig.{linus,next,stable,stable_rc,mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux,jlayton-linux,kdevops-linus} files..."
201+
$(Q)$(MAKE) REFS_COUNT=15 REFS_DIR="user" $(REFS_TARGET_LINUS) $(REFS_TARGET_NEXT) $(REFS_TARGET_STABLE) $(REFS_TARGET_STABLE_RC) $(REFS_TARGET_DEVELOPMENT)
188202

189203
PHONY += refs-user
190204
refs-user: _gen-user-refs
191205

192206
_gen-default-refs-development:
193-
$(Q)$(E) "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
207+
$(Q)$(E) "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux,jlayton-linux,kdevops-linus,stable_rc} files..."
194208
$(Q)$(MAKE) REFS_COUNT=0 REFS_DIR="default" $(REFS_TARGET_DEVELOPMENT)
195209

196210
.PHONY: $(PHONY)

workflows/linux/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ source "workflows/linux/Kconfig.kdevops"
153153
source "workflows/linux/Kconfig.mcgrof"
154154
source "workflows/linux/Kconfig.jlayton"
155155
source "workflows/linux/Kconfig.cel"
156+
source "workflows/linux/Kconfig.stable_rc"
156157

157158
source "workflows/linux/Kconfig.btrfs"
158159

@@ -185,6 +186,7 @@ config BOOTLINUX_TREE_NAME
185186
string
186187
default BOOTLINUX_TREE_LINUS_NAME if BOOTLINUX_TREE_LINUS
187188
default BOOTLINUX_TREE_STABLE_NAME if BOOTLINUX_TREE_STABLE
189+
default BOOTLINUX_TREE_STABLE_RC_NAME if BOOTLINUX_TREE_STABLE_RC
188190
default BOOTLINUX_TREE_NEXT_NAME if BOOTLINUX_TREE_NEXT
189191
default BOOTLINUX_TREE_BTRFS_DEVEL_NAME if BOOTLINUX_TREE_BTRFS_DEVEL
190192
default BOOTLINUX_TREE_KDEVOPS_NAME if BOOTLINUX_TREE_KDEVOPS_LINUS
@@ -200,6 +202,7 @@ config BOOTLINUX_TREE
200202
string
201203
default BOOTLINUX_TREE_LINUS_URL if BOOTLINUX_TREE_LINUS
202204
default BOOTLINUX_TREE_STABLE_URL if BOOTLINUX_TREE_STABLE
205+
default BOOTLINUX_TREE_STABLE_RC_URL if BOOTLINUX_TREE_STABLE_RC
203206
default BOOTLINUX_TREE_NEXT_URL if BOOTLINUX_TREE_NEXT
204207
default BOOTLINUX_TREE_MCGROF_URL if BOOTLINUX_TREE_MCGROF
205208
default BOOTLINUX_TREE_MODULES_URL if BOOTLINUX_TREE_MODULES
@@ -248,6 +251,7 @@ config BOOTLINUX_TREE_REF
248251
string
249252
default BOOTLINUX_TREE_LINUS_REF if BOOTLINUX_TREE_LINUS
250253
default BOOTLINUX_TREE_STABLE_REF if BOOTLINUX_STABLE
254+
default BOOTLINUX_TREE_STABLE_RC_REF if BOOTLINUX_STABLE_RC
251255
default BOOTLINUX_TREE_NEXT_REF if BOOTLINUX_TREE_NEXT
252256
default BOOTLINUX_TREE_VFS_REF if BOOTLINUX_TREE_VFS
253257
default BOOTLINUX_TREE_XFS_REF if BOOTLINUX_TREE_XFS

workflows/linux/Kconfig.dev

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ config BOOTLINUX_TREE_NEXT
1010
help
1111
Use the linux-next tree.
1212

13+
config BOOTLINUX_STABLE_RC
14+
bool "Stable Linux release candidates"
15+
help
16+
Use the linux-stable-rc tree.
17+
1318
config BOOTLINUX_TREE_BTRFS_DEVEL
1419
bool "btrfs-devel"
1520
help

workflows/linux/Kconfig.stable_rc

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
if BOOTLINUX_STABLE_RC
2+
3+
choice
4+
prompt "Linux stable release candidate tree to use"
5+
default BOOTLINUX_TREE_STABLE_RC
6+
7+
config BOOTLINUX_TREE_STABLE_RC
8+
bool "linux-stable-rc"
9+
help
10+
Use the linux-stable release candidate tree.
11+
12+
endchoice
13+
14+
if BOOTLINUX_TREE_STABLE_RC
15+
16+
source "workflows/linux/refs/default/Kconfig.stable_rc"
17+
source "workflows/linux/refs/user/Kconfig.stable_rc"
18+
19+
endif # BOOTLINUX_TREE_STABLE_RC
20+
21+
config BOOTLINUX_TREE_STABLE_RC_NAME
22+
string
23+
default "linux-stable-rc" if BOOTLINUX_TREE_STABLE_RC
24+
25+
config BOOTLINUX_TREE_STABLE_RC_URL
26+
string
27+
default DEFAULT_STABLE_RC_HTTPS_URL if !USE_LOCAL_LINUX_MIRROR
28+
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
29+
default "/mirror/linux-stable-rc.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
30+
31+
endif # BOOTLINUX_STABLE_RC
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: copyleft-next-0.3.1
2+
# Automatically generated file
3+
4+
if !HAVE_BOOTLINUX_TREE_STABLE_RC_USER_REFS
5+
6+
choice
7+
prompt "Tag or branch to use"
8+
9+
config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_54
10+
bool "queue/5.4"
11+
help
12+
Pull the queue/5.4 branch.
13+
14+
config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_510
15+
bool "queue/5.10"
16+
help
17+
Pull the queue/5.10 branch.
18+
19+
config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_515
20+
bool "queue/5.15"
21+
help
22+
Pull the queue/5.15 branch.
23+
24+
config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_61
25+
bool "queue/6.1"
26+
help
27+
Pull the queue/6.1 branch.
28+
29+
config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
30+
bool "queue/6.6"
31+
help
32+
Pull the queue/6.6 branch.
33+
34+
config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
35+
bool "queue/6.12"
36+
help
37+
Pull the queue/6.12 branch.
38+
39+
config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
40+
bool "queue/6.13"
41+
help
42+
Pull the queue/6.13 branch.
43+
44+
endchoice
45+
46+
config BOOTLINUX_TREE_STABLE_RC_REF
47+
string
48+
default "queue/5.4" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_54
49+
default "queue/5.10" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_510
50+
default "queue/5.15" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_515
51+
default "queue/6.1" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_61
52+
default "queue/6.6" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
53+
default "queue/6.12" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
54+
default "queue/6.13" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
55+
56+
endif # !HAVE_BOOTLINUX_TREE_STABLE_RC_USER_REFS
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
configs:
3+
- queue-5.4:
4+
config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_54
5+
ref: "queue/5.4"
6+
help: "Pull the queue/5.4 branch."
7+
- queue-5.10:
8+
config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_510
9+
ref: "queue/5.10"
10+
help: "Pull the queue/5.10 branch."
11+
- queue-5.15:
12+
config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_515
13+
ref: "queue/5.15"
14+
help: "Pull the queue/5.15 branch."
15+
- queue-6.1:
16+
config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_61
17+
ref: "queue/6.1"
18+
help: "Pull the queue/6.1 branch."
19+
- queue-6.6:
20+
config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
21+
ref: "queue/6.6"
22+
help: "Pull the queue/6.6 branch."
23+
- queue-6.12:
24+
config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
25+
ref: "queue/6.12"
26+
help: "Pull the queue/6.12 branch."
27+
- queue-6.13:
28+
config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
29+
ref: "queue/6.13"
30+
help: "Pull the queue/6.13 branch."

0 commit comments

Comments
 (0)