public inbox for kdevops@lists.linux.dev
 help / color / mirror / Atom feed
* [PATCH 0/3] kdevops: update to latest kconfig
@ 2024-09-04 23:30 Luis Chamberlain
  2024-09-04 23:30 ` [PATCH 1/3] scripts/kconfig/kconfig.Makefile: move _refs-default Luis Chamberlain
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Luis Chamberlain @ 2024-09-04 23:30 UTC (permalink / raw)
  To: kdevops, chuck.lever, da.gomez, jlayton; +Cc: mcgrof

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


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-04 23:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-04 23:30 [PATCH 0/3] kdevops: update to latest kconfig Luis Chamberlain
2024-09-04 23:30 ` [PATCH 1/3] scripts/kconfig/kconfig.Makefile: move _refs-default Luis Chamberlain
2024-09-04 23:30 ` [PATCH 2/3] kdevops: remove duplicate symbols and use scripts/append-makefile-vars.sh Luis Chamberlain
2024-09-04 23:30 ` [PATCH 3/3] scripts/gen-refs-default.Makefile: support direct make requests Luis Chamberlain

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox