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 AEFDC149C7B for ; Wed, 4 Sep 2024 23:30:41 +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=uxawh3M85N1rX0qcclqz7h8RQyvprVH7UJhsEDhI9noJrAQaNXBtgIsVw6nrzormc3hlK1XSmSKseZ9TZPPvzI16I3dsIv+at1UNJjmLdl8jFMGwo7h3aWOzGy3kGxnX0gYyTctoXbzK/iVY/7ULBYAaRroLMiukB1MN9j0HuB4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492643; c=relaxed/simple; bh=MybdsQbm9FCOSeb3iazYkSCgKZshwQENtERVw48G6/8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OONe9/kiJEDnh965LWCPYPtOeLABiz16pvTWFabTrXClIaoVRCjSaBl3s452QqQIauBWIjLayo5ha+AbPUDWckzemIettjfgCz6e9fAUZ+xUL5jcYzXYNhKUEbbnGTiPmYkyUOlyG64mXhDvEoxjWsoHn+Gpv5h/6x2V8y14G4w= 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=Ap7ZZj1E; 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="Ap7ZZj1E" 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:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=Zg/LlMNhSkWrzgu1XLEE+wYJdF+1iwyIOBjM/WDiFN4=; b=Ap7ZZj1E60IH8nqG7rojmS+n+1 w/tv3lJez9E3SDTaOOFC8h+caRvkh7eJl0h3gbd1jxnSaN0Ywubg4JlsX5PCGDbOc05p+uF3YXeGg o3+GDZX5QRnn6Ik/AAGXsPFXy90KfaqTLiP9NQxva7AoLw9eeM4yRgOIFs3Kcs81LjyecWYZSdPiE OVNHzAj3CptEAop7NOw3P4SGR3Ej9jMphi3Bq/QV9QyMGt8gxDBrxbx3KEltBBg/g2hmnxQ9Knrd2 6QbZxCR4Y5MuWAQ7S4zSdy0ACkY3p2hWltcRvx7xzz5NkNo763dXjr/3FuQNq9TfEOSyBFbo3AeXQ VjahCcjA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1slzSQ-00000006MRP-25vo; 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 0/3] kdevops: update to latest kconfig Date: Wed, 4 Sep 2024 16:30:34 -0700 Message-ID: <20240904233037.1516218-1-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 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 This is the first part of the kconfig selective yaml config support. kdevops has embraced git subtrees (note, not git submodule, those are gross), so to allow us to adapt kconfig from an external git tree which allows random projects to easily upgrade their versions of kconfig. When we decided that the kdevops results archive was too large and to start our git tree from scratch to keep it slim, the initial import did not have the kconfig git tree incantations. So what we do is use the git subtree split feature so to split out the work on scripts/kconfig up to the latest known kconfig git tree git commit we sync'd to, which is dce7653757b4 ("kconfig: fix parallel builds for menuconfig") and use the current kdevops git commit 4b42b104d5ecd ("linux-mirror: complete ansible conversion"). And so I just ran: I just ran: git subtree split --prefix=scripts/kconfig/ --onto \ dce7653757b4f26945c09744b131d2daabe6257d \ 4b42b104d5ecd15b8fc3af0a71944ebb626dad03 \ --rejoin https://github.com/linux-kdevops/kconfig.git This will allow us to later update kconfig as if we had started the git subtree on scripts/kconfig with the following: git remote add kconfig https://github.com/linux-kdevops/kconfig.git git fetch kconfig git subtree add --prefix=scripts/kconfig kconfig master Note that the above is not well represented in git with git format-patch as you'll just see the merge commit in git history, git format-patch will send the entire history and so I'm just including the commands I run here to get us back to using a git subtree for scripts/kconfig/. The patches in this series allow us to later update kconfig using git subtree afterwards, so the patches in this series apply after the above command. Then after the patches in this series I just run the following command to get us to upgrade to the kconfig master branch which gets kdevops kconfig in sync with the kconfig linux-next tag of next-20240830: git subtree --squash pull --prefix=scripts/kconfig/ kconfig master At this point we don't yet have selective yamlconfig support. To merge that support and use it, will be addressed in the next patch series. But note.. since the latest kconfig git subtree has nconfig support fixed we also get to use it, so try running 'make nconfig' on this branch: https://github.com/mcgrof/kdevops/tree/nconfig The first two patches in this series are what we need to update the latest kconfig and support nconfig, the last patch "scripts/gen-refs-default.Makefile: support direct make requests" is just a cleanup drive-through, and so not required but we might as well add it. If this seems agreeable please let me know and I'll just merge this, nothing controversial at this point other than just getting us up to speed again to be able to track kconfig as a git subtree and updates us to kconfig linux-next tag next-20240830. Luis Chamberlain (3): scripts/kconfig/kconfig.Makefile: move _refs-default kdevops: remove duplicate symbols and use scripts/append-makefile-vars.sh scripts/gen-refs-default.Makefile: support direct make requests Makefile | 2 +- kconfigs/Kconfig.ansible_provisioning | 24 ++++++----------------- scripts/dynamic-kconfig.Makefile | 2 +- scripts/gen-refs-default.Makefile | 28 ++++++++++----------------- scripts/kconfig/kconfig.Makefile | 2 +- terraform/aws/Kconfig | 14 -------------- vagrant/Kconfig | 3 ++- vagrant/Kconfig.opensuse | 22 --------------------- 8 files changed, 21 insertions(+), 76 deletions(-) -- 2.43.0