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 9739C186A for ; Sat, 30 Mar 2024 02:25:42 +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=ecyLH8CUsKTY2sgwaP2J7EMguB9VtTdFbhRBlhaJhizkUBU38m9jzTWsY3zKT58nwKn3TIPOFwH5gR+9K6p5LB9gLiEUOzfnlfBQa+za3TYKKA2Disk5DttcyXWxnyprFCmAQ2pp0tMlP6eCsEWNV636aGq+3roBAh5DCkW07Jc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765545; c=relaxed/simple; bh=VOVmqeOyCmGsu6WJKRnAuVaD2vQOw06fqhC1aiSNKaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ODZ2WkMT1VAySBgMBq76EB2GFOB+T6ayWkBCWrllhK5DZXVU094LMZ7ovgXsX53g2beU0JovUYgG10w2GnGWbBZfVzxZS/6INF6FN5ss8I7hK0817i74pZjqhLLjYPwpQQUN1JHSOu2bTIGkB4nUFAT791dece8tPBZyZwazai8= 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=DEGpA25X; 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="DEGpA25X" 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=GeGWjzK3xxBBwlhJWBKeSiW6re2hkcqf0rqJDkKLsxQ=; b=DEGpA25Xx+8rctZSLyCLKem6SN oKVp2R9UNfbzckL0lXhc+4f10kFt7qUw5ALy+Hsk5D/tf2EPlcX3tqH9YQpyPv/D6hjzXFxjm1ldE s/mzWi7lzSVybFVZ0XHanHjGLH37RjLzEccXwdYqpAh3mdj4EgUq8tlvwK0w3gy2NFLxxx5bpIPlB /pmU+9IpvNchECKvP8GcSx5X2Pq0D38Xd/RnJRd5h0x6VMoxgOJt9if29pclfY8rIOP3pto3Frot4 RIe7fWCGUWb/wTrveV8kwvKvam4BcxdDW9FPeFR6/tYd2aVaqMwsMJST4FbtPxHCk9SvKPKwFtynW TDUMlfLw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPd-00000002ZL9-3VOF; Sat, 30 Mar 2024 02:25:41 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 04/18] mirrors: add guestfs mirror options without 9p Date: Fri, 29 Mar 2024 19:25:26 -0700 Message-ID: <20240330022540.612487-5-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 9p is disabled git cloning using mirroring needs to rely on the bridge IP which is different on guestfs than on vagrant. Add the proper bridge IP this case. Note that most users use 9p, so this just fixes the mirroring option when 9p is disabled. signed-off-by: Luis Chamberlain --- workflows/linux/Kconfig.linus | 3 ++- workflows/linux/Kconfig.mcgrof | 2 ++ workflows/linux/Kconfig.next | 3 ++- workflows/linux/Kconfig.stable | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/workflows/linux/Kconfig.linus b/workflows/linux/Kconfig.linus index 5c524e5266ae..14d3e0c0f360 100644 --- a/workflows/linux/Kconfig.linus +++ b/workflows/linux/Kconfig.linus @@ -69,7 +69,8 @@ config BOOTLINUX_TREE_LINUS_NAME config BOOTLINUX_TREE_LINUS_URL string default "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" if !USE_LOCAL_LINUX_MIRROR - default "git://192.168.124.1/mirror/linux.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/linux.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS default "/mirror/linux.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P endif # BOOTLINUX_TREE_LINUS diff --git a/workflows/linux/Kconfig.mcgrof b/workflows/linux/Kconfig.mcgrof index 4c4be5b72aff..f2d2f898234f 100644 --- a/workflows/linux/Kconfig.mcgrof +++ b/workflows/linux/Kconfig.mcgrof @@ -65,5 +65,7 @@ config BOOTLINUX_MCGROF_TREE_URL default "/mirror/mcgrof-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && BOOTLINUX_9P default "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git" if BOOTLINUX_TREE_MCGROF_LINUS && !USE_LOCAL_LINUX_MIRROR default "/mirror/mcgrof-linus.git" if BOOTLINUX_TREE_MCGROF_LINUS && USE_LIBVIRT_MIRROR && BOOTLINUX_9P + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/mcgrof-linus.git) if BOOTLINUX_TREE_MCGROF_LINUS && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/mcgrof-next.git) if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS endif # BOOTLINUX_TREE_MCGROF_LINUS || BOOTLINUX_TREE_MCGROF_NEXT diff --git a/workflows/linux/Kconfig.next b/workflows/linux/Kconfig.next index 48c86e3dbc08..6fdb53077aa7 100644 --- a/workflows/linux/Kconfig.next +++ b/workflows/linux/Kconfig.next @@ -11,7 +11,8 @@ config BOOTLINUX_TREE_NEXT_NAME config BOOTLINUX_TREE_NEXT_URL string default "https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" if !USE_LOCAL_LINUX_MIRROR - default "git://192.168.124.1/mirror/linux-next.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/linux-next.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux-next.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS default "/mirror/linux-next.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P endif # BOOTLINUX_TREE_NEXT diff --git a/workflows/linux/Kconfig.stable b/workflows/linux/Kconfig.stable index 39c1984a0630..a0eaa1bffadf 100644 --- a/workflows/linux/Kconfig.stable +++ b/workflows/linux/Kconfig.stable @@ -85,7 +85,8 @@ config BOOTLINUX_TREE_STABLE_NAME config BOOTLINUX_TREE_STABLE_URL string default "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" if !USE_LOCAL_LINUX_MIRROR - default "git://192.168.124.1/mirror/linux-stable.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/linux-stable.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux-stable.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS default "/mirror/linux-stable.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P endif # BOOTLINUX_STABLE -- 2.43.0