From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83FAB1FB2 for ; Sat, 30 Mar 2024 02:25:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765545; cv=none; b=sglrOjqcDhGrWZjsYwzcSlJZNpRJJqSfQHcIeGuaL7jlO7MX/VrHls50PG2O6zI8MI3+1j9wXRhRi5nt9zplMRIaaQEy2HKHL2N8YPhG2H2xjPMCb4l/YjcOcxYgfcTU2ehTXdP0H1nxhWu0X4KylOXuzL94vZ4KBne722aj9p0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765545; c=relaxed/simple; bh=BQWUCKL8V/O70Ha9VnDOmQ0h3JDnuG5NotiZxr51L40=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KgTY/FQWRpGByO194vKeWBSgOcagwT+JxYwvWMyzqfljJG24yjp0i/u3kXEAaQIti8cyXuJLGPYqPWV4z91+G+3hoOl48IsE3gVm7t5r67mcKr76hknUlTRNMowrGlKrlv6Tis4mv3S/R4pziXtPsj+avjZn1sYD2FMNo4Kbw6E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=B9Hg3tkK; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="B9Hg3tkK" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=LdlxfOGCwsaShhZ3co7F2mx1LS4iB2fbYQiRUeBLWpA=; b=B9Hg3tkK/8bRVl8dB0adVlsmGn cQsHhtsINuNWbGj3tQL2eeM3TU2r/OTOjhKCwehuKZS+Yf8Vf+Az+u68pxqETf5SueGq6Fa6aDdZL HX97yKn1GBsRZhZo/xq43tc7H742hPLj7Lg/8RakfDq7R7Q8l7MH0B6UBDnjk9ybz7G8tFJbSD7D0 cx6E0shmxUF5GZMaNvz6TOouvm4a41ocmxHw/L4sfHIUi2Jcx82dhz0w2k3avNyvZIYhPgnZUcIRh R2R9RpBxXcDg16asqA415p/NGwLDYQaAh9tnlj07nIGPwwpkV9zyZcyr+2CXkTPY3wCbkLiV62mpD qt0DIR+Q==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPe-00000002ZLu-2YZJ; Sat, 30 Mar 2024 02:25:42 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 14/18] mirrors: move mirror editing into one file Date: Fri, 29 Mar 2024 19:25:36 -0700 Message-ID: <20240330022540.612487-15-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240330022540.612487-1-mcgrof@kernel.org> References: <20240330022540.612487-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain 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 --- 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