From: Luis Chamberlain <mcgrof@kernel.org>
To: kdevops@lists.linux.dev
Cc: Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 14/18] mirrors: move mirror editing into one file
Date: Fri, 29 Mar 2024 19:25:36 -0700 [thread overview]
Message-ID: <20240330022540.612487-15-mcgrof@kernel.org> (raw)
In-Reply-To: <20240330022540.612487-1-mcgrof@kernel.org>
When we add a mirror we edit two Makefiles, reduce this to just one.
To do this we must ensure we can include .config on it, use the full
path to make that work.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
Makefile.linux-mirror | 13 -------------
.../linux-mirror/linux-mirror-systemd/Makefile | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/Makefile.linux-mirror b/Makefile.linux-mirror
index 40532eb0e477..c355c4a0ea98 100644
--- a/Makefile.linux-mirror
+++ b/Makefile.linux-mirror
@@ -40,16 +40,3 @@ mirror-help-menu:
@echo ""
HELP_TARGETS += mirror-help-menu
-
-export TORVALDS := $(subst ",,$(CONFIG_MIRROR_TORVALDS_URL))
-export STABLE := $(subst ",,$(CONFIG_MIRROR_STABLE_URL))
-export NEXT := $(subst ",,$(CONFIG_MIRROR_NEXT_URL))
-export KDEVOPS_LINUS := $(subst ",,$(CONFIG_MIRROR_KDEVOPS_LINUS_URL))
-export MCGROF := $(subst ",,$(CONFIG_MIRROR_MCGROF_URL))
-export MCGROF_LINUS := $(subst ",,$(CONFIG_MIRROR_MCGROF_LINUS_URL))
-export QEMU := $(subst ",,$(CONFIG_MIRROR_QEMU_URL))
-export QEMU_JIC23 := $(subst ",,$(CONFIG_MIRROR_QEMU_JIC23_URL))
-export KDEVOPS := $(subst ",,$(CONFIG_MIRROR_KDEVOPS_URL))
-export FSTESTS := $(subst ",,$(CONFIG_MIRROR_FSTESTS_URL))
-export KDEVOPS_FSTESTS := $(subst ",,$(CONFIG_MIRROR_KDEVOPS_FSTESTS_URL))
-export BLKTESTS := $(subst ",,$(CONFIG_MIRROR_BLKTESTS_URL))
diff --git a/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile b/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile
index 367ffdc526df..61b0c5195bc9 100644
--- a/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile
+++ b/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile
@@ -1,6 +1,24 @@
USER_SYSTEM := ~/.config/systemd/user/
MIRROR_PATH := /mirror
+ifeq (,$(wildcard $(TOPDIR_PATH)/.config))
+else
+include $(TOPDIR_PATH)/.config
+endif
+
+export TORVALDS := $(subst ",,$(CONFIG_MIRROR_TORVALDS_URL))
+export STABLE := $(subst ",,$(CONFIG_MIRROR_STABLE_URL))
+export NEXT := $(subst ",,$(CONFIG_MIRROR_NEXT_URL))
+export KDEVOPS_LINUS := $(subst ",,$(CONFIG_MIRROR_KDEVOPS_LINUS_URL))
+export MCGROF := $(subst ",,$(CONFIG_MIRROR_MCGROF_URL))
+export MCGROF_LINUS := $(subst ",,$(CONFIG_MIRROR_MCGROF_LINUS_URL))
+export QEMU := $(subst ",,$(CONFIG_MIRROR_QEMU_URL))
+export QEMU_JIC23 := $(subst ",,$(CONFIG_MIRROR_QEMU_JIC23_URL))
+export KDEVOPS := $(subst ",,$(CONFIG_MIRROR_KDEVOPS_URL))
+export FSTESTS := $(subst ",,$(CONFIG_MIRROR_FSTESTS_URL))
+export KDEVOPS_FSTESTS := $(subst ",,$(CONFIG_MIRROR_KDEVOPS_FSTESTS_URL))
+export BLKTESTS := $(subst ",,$(CONFIG_MIRROR_BLKTESTS_URL))
+
LINUX_SERVICES := linux-mirror.service
LINUX_SERVICES += linux-stable-mirror.service
LINUX_SERVICES += linux-next-mirror.service
--
2.43.0
next prev parent reply other threads:[~2024-03-30 2:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-30 2:25 [PATCH 00/18] mirrors: enhance and add tons of mirrors Luis Chamberlain
2024-03-30 2:25 ` [PATCH 01/18] linux-mirror: add kdevops mirroring support Luis Chamberlain
2024-03-30 2:25 ` [PATCH 02/18] Makefile.min_deps: add netcat as a min binary dependency Luis Chamberlain
2024-03-30 2:25 ` [PATCH 03/18] provision: generalize bridge-ip further Luis Chamberlain
2024-03-30 2:25 ` [PATCH 04/18] mirrors: add guestfs mirror options without 9p Luis Chamberlain
2024-03-30 2:25 ` [PATCH 05/18] mirrors: enable kdevops mirror Luis Chamberlain
2024-03-30 2:25 ` [PATCH 06/18] mirrors: add fstests to mirrors Luis Chamberlain
2024-03-30 2:25 ` [PATCH 07/18] fstests: use local primary fstests mirror if present Luis Chamberlain
2024-03-30 2:25 ` [PATCH 08/18] mirrors: add kdevops git alternative for fstests Luis Chamberlain
2024-03-30 2:25 ` [PATCH 09/18] mirrors: use kdevops fstests mirror when available Luis Chamberlain
2024-03-30 2:25 ` [PATCH 10/18] mirrors: add blktests mirror Luis Chamberlain
2024-03-30 2:25 ` [PATCH 11/18] mirrors: use blktests mirror when its available Luis Chamberlain
2024-03-30 2:25 ` [PATCH 12/18] mirrors: increase scope of mirroring in output Luis Chamberlain
2024-03-30 2:25 ` [PATCH 13/18] mirrors: move status check Luis Chamberlain
2024-03-30 2:25 ` Luis Chamberlain [this message]
2024-03-30 2:25 ` [PATCH 15/18] mirrors: add new mirrors.yaml and add xfsprogs Luis Chamberlain
2024-03-30 2:25 ` [PATCH 16/18] mirrors: add xfsdump mirror and use it Luis Chamberlain
2024-03-30 2:25 ` [PATCH 17/18] mirrors: add dbench git Luis Chamberlain
2024-03-30 2:25 ` [PATCH 18/18] mirrors: add blktrace mirror and use it Luis Chamberlain
2024-03-30 16:37 ` [PATCH 00/18] mirrors: enhance and add tons of mirrors Chuck Lever III
2024-04-03 1:01 ` Luis Chamberlain
2024-04-03 18:04 ` Chuck Lever III
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240330022540.612487-15-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox