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 34DEE179958 for ; Wed, 4 Sep 2024 23:30: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=1725492643; cv=none; b=JMzNXM/xxPPMyHBQXYPeNbW22AhOMPG/BhmAr5wicx+a5pE5nXO4s2DmpM5s3+LIQE1dxb9DKgmvg+nxOs44hGC7280OX3eR+37cCgA76hQnJf5yVdoanrE597hP76Rm/e6P7SMkfGf0Zc2dkfBbJIlkY/mhFsF/b7XzuC3kH6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492643; c=relaxed/simple; bh=9sKP4UG31uu5i5fl9xEA6kEt7JfYXvdFGSIa3IvoDOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lagB+5YxnFlQWlbKAPJzHIU7sOPJk2EzJ9x1EShYIqHKeJUKLYcni0ktCEDydSACpxKmQzjpbE5T78ncMIXHMvD5ZWqAi2eZwyoNMhYBrAa5ZlPW9mlEJnmPSGeSNXtGV+s5Qjf+alVktkl5PzFECsn6gVhQ3zIvlJYDGmYCR3Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine 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=ewCHkkFl; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine 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="ewCHkkFl" 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=XjRA3p5USRmHnyDZvPq7e6fT/mIjJNg4bGfU3FfQ/Bo=; b=ewCHkkFlI9zLQgJ1Jcf7Rlwsja R+oJbGA3A2yiTyi9jY5lythQkdG8KvXkCbEqV5TKwPPwFORsuQFqOQF1EdJAOoyDtjBOdQq9Xix7u UkexyAZaUWG6y7USSiVRfwVdpBASd6ZiKH4TfZ0WPhQM0P6acheKSwWWyCKeTKTxl1jd9zIcO8/2W vBRG8W0bt5kN6jl4mGysJ0lzXtbcQsoGra575t6Mn7M1JKDhmOfY0J3ZE8aYtWd/3+83Bayl4UWMU FkUicA8bm3ZNmXGGd47AMlsUc9Er4DTPfHVcUCTIMACGMIfdF9WpO6kTIQFRYzmKlcCFvIXtc0xTa 5ejllD2Q==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1slzSQ-00000006MRV-2ac0; Wed, 04 Sep 2024 23:30:38 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, chuck.lever@oracle.com, da.gomez@samsung.com, jlayton@kernel.org Cc: mcgrof@kernel.org Subject: [PATCH 3/3] scripts/gen-refs-default.Makefile: support direct make requests Date: Wed, 4 Sep 2024 16:30:37 -0700 Message-ID: <20240904233037.1516218-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240904233037.1516218-1-mcgrof@kernel.org> References: <20240904233037.1516218-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 Today we can't use: rm -f workflows/linux/refs/default/Kconfig.linus make workflows/linux/refs/default/Kconfig.linus Add support for this and simplify the definitions. Signed-off-by: Luis Chamberlain --- Makefile | 2 +- scripts/gen-refs-default.Makefile | 28 ++++++++++------------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index b961e44f4aa6..9d4e954811ab 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ export KDEVOPS_VAGRANT := export PYTHONUNBUFFERED=1 export TOPDIR=./ export TOPDIR_PATH = $(shell readlink -f $(TOPDIR)) +include scripts/refs.Makefile KDEVOPS_NODES_ROLE_TEMPLATE_DIR := $(KDEVOPS_PLAYBOOKS_DIR)/roles/gen_nodes/templates export KDEVOPS_NODES_TEMPLATE := @@ -174,7 +175,6 @@ endif include scripts/gen-hosts.Makefile include scripts/gen-nodes.Makefile -include scripts/refs.Makefile # disable built-in rules for this .SUFFIXES: diff --git a/scripts/gen-refs-default.Makefile b/scripts/gen-refs-default.Makefile index b04542283211..c5d12e152cb4 100644 --- a/scripts/gen-refs-default.Makefile +++ b/scripts/gen-refs-default.Makefile @@ -1,14 +1,12 @@ # SPDX-License-Identifier: copyleft-next-0.3.1 -REFS_TARGET_LNS := gen_default_refs_linus -REFS_TARGET_LNS += gen_default_refs_next -REFS_TARGET_LNS += gen_default_refs_stable +REF_DEF_OBJS := $(addprefix $(TOPDIR)/workflows/linux/refs/default/, Kconfig.linus Kconfig.next Kconfig.stable) +REF_DEF_SRC := $(addprefix $(TOPDIR)/workflows/linux/refs/static/, linus.yaml next.yaml stable.yaml) KRELEASES_FORCE := $(if $(filter --force,$(KRELEASES_FORCE)),--force,) -.PHONY += gen_default_refs_linus -gen_default_refs_linus: - $(Q)$(E) "Generating refs/default/Kconfig.$(patsubst gen_default_refs_%,%,$@)..." +$(TOPDIR)/workflows/linux/refs/default/Kconfig.linus: $(TOPDIR)/workflows/linux/refs/static/linus.yaml + $(Q)$(E) "Generating $@..." $(Q)./scripts/generate_refs.py \ --prefix BOOTLINUX_TREE_LINUS \ --output workflows/linux/refs/default/Kconfig.linus \ @@ -17,9 +15,8 @@ gen_default_refs_linus: kreleases \ --moniker mainline -.PHONY += gen_default_refs_next -gen_default_refs_next: - $(Q)$(E) "Generating refs/default/Kconfig.$(patsubst gen_default_refs_%,%,$@)..." +$(TOPDIR)/workflows/linux/refs/default/Kconfig.next: $(TOPDIR)/workflows/linux/refs/static/next.yaml + $(Q)$(E) "Generating $@..." $(Q)./scripts/generate_refs.py \ --prefix BOOTLINUX_TREE_NEXT \ --output workflows/linux/refs/default/Kconfig.next \ @@ -28,9 +25,8 @@ gen_default_refs_next: kreleases \ --moniker linux-next -.PHONY += gen_default_refs_stable -gen_default_refs_stable: - $(Q)$(E) "Generating refs/default/Kconfig.$(patsubst gen_default_refs_%,%,$@)..." +$(TOPDIR)/workflows/linux/refs/default/Kconfig.stable: $(TOPDIR)/workflows/linux/refs/static/stable.yaml + $(Q)$(E) "Generating $@..." $(Q)./scripts/generate_refs.py \ --prefix BOOTLINUX_TREE_STABLE \ --output workflows/linux/refs/default/Kconfig.stable \ @@ -39,14 +35,10 @@ gen_default_refs_stable: kreleases \ --moniker stable -_gen-default-refs-lns: - $(Q)$(E) "Generating refs/default/Kconfig.{linus,next,stable} files..." - $(Q)$(MAKE) $(REFS_TARGET_LNS) KRELEASES_FORCE="--force" - PHONY += refs-default -refs-default: _gen-default-refs-lns _gen-default-refs-development refs-user-clean +refs-default: $(REF_DEF_OBJS) _gen-default-refs-development refs-user-clean PHONY += _refs-default -_refs-default: _gen-default-refs-lns +_refs-default: $(REF_DEF_OBJS) .PHONY: $(PHONY) -- 2.43.0