Skip to content

Commit 6c7bc7d

Browse files
committed
linux-mirror: Enable choice of clone protocol for stable-rc tree
Add linux-stable-rc to the "Install local mirror setup" menu so that users can select which default protocol and master to pull from. Reviewed-by: Luis Chamberlain <[email protected]> Reviewed-by: Daniel Gomez <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 1aff68d commit 6c7bc7d

File tree

3 files changed

+54
-0
lines changed

3 files changed

+54
-0
lines changed

Makefile.linux-mirror

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ LINUX_MIRROR_ARGS += mirror_qemu_jic23_url='$(subst ",,$(CONFIG_MIRROR_KDEVOPS_U
1717
LINUX_MIRROR_ARGS += mirror_mcgrof_linus_url='$(subst ",,$(CONFIG_MIRROR_MCGROF_LINUS_URL))'
1818
LINUX_MIRROR_ARGS += mirror_mcgrof_url='$(subst ",,$(CONFIG_MIRROR_MCGROF_URL))'
1919
LINUX_MIRROR_ARGS += mirror_stable_url='$(subst ",,$(CONFIG_MIRROR_STABLE_URL))'
20+
LINUX_MIRROR_ARGS += mirror_stable_rc_url='$(subst ",,$(CONFIG_MIRROR_STABLE_RC_URL))'
2021
LINUX_MIRROR_ARGS += mirror_torvalds_url='$(subst ",,$(CONFIG_MIRROR_TORVALDS_URL))'
2122
endif
2223

kconfigs/Kconfig.defaults

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,18 @@ config DEFAULT_STABLE_HTTPS_GOOGLE_URL
164164
string
165165
default "https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git"
166166

167+
config DEFAULT_STABLE_RC_GIT_URL
168+
string
169+
default "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
170+
171+
config DEFAULT_STABLE_RC_HTTPS_URL
172+
string
173+
default "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
174+
175+
config DEFAULT_STABLE_RC_HTTPS_GOOGLE_URL
176+
string
177+
default "https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
178+
167179
config DEFAULT_VFS_GIT_URL
168180
string
169181
default "git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git"

kconfigs/Kconfig.mirror

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,47 @@ config MIRROR_STABLE_URL
370370
default DEFAULT_STABLE_HTTPS_URL if MIRROR_STABLE_HTTPS
371371
default DEFAULT_STABLE_HTTPS_GOOGLE_URL if MIRROR_STABLE_HTTPS_GOOGLE
372372

373+
choice
374+
prompt "Linux stable rc mirror protocol/source"
375+
default MIRROR_STABLE_RC_GIT if MIRROR_GIT_WORKS
376+
default MIRROR_STABLE_RC_HTTPS if !MIRROR_GIT_WORKS
377+
depends on INSTALL_LOCAL_LINUX_MIRROR
378+
379+
config MIRROR_STABLE_RC_HTTPS
380+
bool "HTTPS (kernel.org)"
381+
help
382+
If you enable this option then the mirror will use HTTPS to access
383+
the linux-stable-rc repository on git.kernel.org. The full URL is:
384+
385+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
386+
387+
config MIRROR_STABLE_RC_HTTPS_GOOGLE
388+
bool "HTTPS (Google)"
389+
help
390+
If you enable this option then the mirror will use HTTPS to access
391+
the linux-stable-rc repository on kernel.googlesource.com The full
392+
URL is:
393+
394+
https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
395+
396+
config MIRROR_STABLE_RC_GIT
397+
bool "Git (kernel.org)"
398+
depends on MIRROR_GIT_WORKS
399+
help
400+
If you enable this option then the mirror will use the GIT protocol
401+
to access the linux-stable-rc repository on git.kernel.org. The
402+
full URL is:
403+
404+
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
405+
406+
endchoice
407+
408+
config MIRROR_STABLE_RC_URL
409+
string
410+
default DEFAULT_STABLE_RC_GIT_URL if MIRROR_STABLE_RC_GIT
411+
default DEFAULT_STABLE_RC_HTTPS_URL if MIRROR_STABLE_RC_HTTPS
412+
default DEFAULT_STABLE_RC_HTTPS_GOOGLE_URL if MIRROR_STABLE_RC_HTTPS_GOOGLE
413+
373414
choice
374415
prompt "Linux xfs kernel tree"
375416
default MIRROR_XFS_GIT if MIRROR_GIT_WORKS

0 commit comments

Comments
 (0)