* [RFC PATCH] refs: "make mrproper" should clean out generated refs files
@ 2025-03-12 13:00 cel
2025-03-12 15:05 ` Chuck Lever
0 siblings, 1 reply; 8+ messages in thread
From: cel @ 2025-03-12 13:00 UTC (permalink / raw)
To: kdevops; +Cc: Daniel Gomez, Chuck Lever
From: Chuck Lever <chuck.lever@oracle.com>
Doing a "make mrproper" should force the regeneration of the
default and user refs files. Otherwise these become stale because
kdevops appears to check if they exist, but not if they are newer
than the source yaml files.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
scripts/build.Makefile | 2 ++
1 file changed, 2 insertions(+)
Simple patch, but might be controversial, so I'm posting for comments.
diff --git a/scripts/build.Makefile b/scripts/build.Makefile
index 4d3d90ab01ef..f4100bc06347 100644
--- a/scripts/build.Makefile
+++ b/scripts/build.Makefile
@@ -8,6 +8,8 @@ clean: $(clean-subdirs)
PHONY += mrproper
mrproper:
+ @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/default/
+ @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/user/
@$(Q)rm -rf $(CURDIR)/include/config/
@$(Q)rm -rf $(CURDIR)/include/generated/
@$(Q)rm -f .config
--
2.48.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [RFC PATCH] refs: "make mrproper" should clean out generated refs files
2025-03-12 13:00 [RFC PATCH] refs: "make mrproper" should clean out generated refs files cel
@ 2025-03-12 15:05 ` Chuck Lever
2025-03-12 16:27 ` Daniel Gomez
0 siblings, 1 reply; 8+ messages in thread
From: Chuck Lever @ 2025-03-12 15:05 UTC (permalink / raw)
To: Daniel Gomez; +Cc: cel, kdevops
On 3/12/25 9:00 AM, cel@kernel.org wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
>
> Doing a "make mrproper" should force the regeneration of the
> default and user refs files. Otherwise these become stale because
> kdevops appears to check if they exist, but not if they are newer
> than the source yaml files.
>
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> scripts/build.Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> Simple patch, but might be controversial, so I'm posting for comments.
And my comment is: this breaks things. Please ignore it.
So what I'm trying to fix is that when I change refs/static/yada.yml,
the default and user refs do not appear to be regenerated, even if
I use "make refs-default". I am probably missing something simple.
> diff --git a/scripts/build.Makefile b/scripts/build.Makefile
> index 4d3d90ab01ef..f4100bc06347 100644
> --- a/scripts/build.Makefile
> +++ b/scripts/build.Makefile
> @@ -8,6 +8,8 @@ clean: $(clean-subdirs)
>
> PHONY += mrproper
> mrproper:
> + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/default/
> + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/user/
> @$(Q)rm -rf $(CURDIR)/include/config/
> @$(Q)rm -rf $(CURDIR)/include/generated/
> @$(Q)rm -f .config
--
Chuck Lever
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC PATCH] refs: "make mrproper" should clean out generated refs files
2025-03-12 15:05 ` Chuck Lever
@ 2025-03-12 16:27 ` Daniel Gomez
2025-03-12 16:30 ` Daniel Gomez
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Gomez @ 2025-03-12 16:27 UTC (permalink / raw)
To: Chuck Lever; +Cc: cel, kdevops
On Wed, Mar 12, 2025 at 11:05:26AM +0100, Chuck Lever wrote:
> On 3/12/25 9:00 AM, cel@kernel.org wrote:
> > From: Chuck Lever <chuck.lever@oracle.com>
> >
> > Doing a "make mrproper" should force the regeneration of the
> > default and user refs files. Otherwise these become stale because
> > kdevops appears to check if they exist, but not if they are newer
> > than the source yaml files.
> >
> > Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> > ---
> > scripts/build.Makefile | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > Simple patch, but might be controversial, so I'm posting for comments.
>
> And my comment is: this breaks things. Please ignore it.
>
> So what I'm trying to fix is that when I change refs/static/yada.yml,
> the default and user refs do not appear to be regenerated, even if
> I use "make refs-default". I am probably missing something simple.
Yes, that is how it should work. When we change the static files we need to
run `make refs-default` to regenerate the files and then you can push them to
the tree.
Also, docs/kdevops-autorefs.md for more context.
Daniel
>
>
> > diff --git a/scripts/build.Makefile b/scripts/build.Makefile
> > index 4d3d90ab01ef..f4100bc06347 100644
> > --- a/scripts/build.Makefile
> > +++ b/scripts/build.Makefile
> > @@ -8,6 +8,8 @@ clean: $(clean-subdirs)
> >
> > PHONY += mrproper
> > mrproper:
> > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/default/
> > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/user/
> > @$(Q)rm -rf $(CURDIR)/include/config/
> > @$(Q)rm -rf $(CURDIR)/include/generated/
> > @$(Q)rm -f .config
>
>
> --
> Chuck Lever
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC PATCH] refs: "make mrproper" should clean out generated refs files
2025-03-12 16:27 ` Daniel Gomez
@ 2025-03-12 16:30 ` Daniel Gomez
2025-03-12 16:37 ` Daniel Gomez
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Gomez @ 2025-03-12 16:30 UTC (permalink / raw)
To: Chuck Lever; +Cc: cel, kdevops
On Wed, Mar 12, 2025 at 05:27:06PM +0100, Daniel Gomez wrote:
> On Wed, Mar 12, 2025 at 11:05:26AM +0100, Chuck Lever wrote:
> > On 3/12/25 9:00 AM, cel@kernel.org wrote:
> > > From: Chuck Lever <chuck.lever@oracle.com>
> > >
> > > Doing a "make mrproper" should force the regeneration of the
> > > default and user refs files. Otherwise these become stale because
> > > kdevops appears to check if they exist, but not if they are newer
> > > than the source yaml files.
> > >
> > > Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> > > ---
> > > scripts/build.Makefile | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > Simple patch, but might be controversial, so I'm posting for comments.
> >
> > And my comment is: this breaks things. Please ignore it.
> >
> > So what I'm trying to fix is that when I change refs/static/yada.yml,
> > the default and user refs do not appear to be regenerated, even if
> > I use "make refs-default". I am probably missing something simple.
>
> Yes, that is how it should work. When we change the static files we need to
> run `make refs-default` to regenerate the files and then you can push them to
> the tree.
>
> Also, docs/kdevops-autorefs.md for more context.
make refs-default V=1
echo "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files...
make REFS_COUNT=0 REFS_DIR="default" gen_refs_mcgrof_linus gen_refs_mcgrof_next gen_refs_modules gen_refs_btrfs_devel gen_refs_cel_linux gen_refs_jlayton_linux gen_refs_kdevops_
echo "Generating refs/default/Kconfig.mcgrof-linus (0 refs)..."
Generating refs/default/Kconfig.mcgrof-linus (0 refs)...
./scripts/generate_refs.py \
--prefix BOOTLINUX_TREE_MCGROF_LINUS \
--output workflows/linux/refs/default/Kconfig.mcgrof-linus \
--extra workflows/linux/refs/static/mcgrof-linus.yaml \
--force \
gitref \
--repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git \
--refs 0
echo "Generating refs/default/Kconfig.mcgrof-next (0 refs)..."
Generating refs/default/Kconfig.mcgrof-next (0 refs)...
./scripts/generate_refs.py \
--prefix BOOTLINUX_TREE_MCGROF_NEXT \
--output workflows/linux/refs/default/Kconfig.mcgrof-next \
--extra workflows/linux/refs/static/mcgrof-next.yaml \
--force \
gitref \
--repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git \
--refs 0
...
echo "Generating refs/default/Kconfig.cel-linux (0 refs)..."
Generating refs/default/Kconfig.cel-linux (0 refs)...
./scripts/generate_refs.py \
--prefix BOOTLINUX_TREE_CEL_LINUX \
--output workflows/linux/refs/default/Kconfig.cel-linux \
--extra workflows/linux/refs/static/cel-linux.yaml \
--force \
gitref \
--repo https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git \
--refs 0
...
But I think I remember seeing a typo in CEL and have a commit for it.
>
> Daniel
>
> >
> >
> > > diff --git a/scripts/build.Makefile b/scripts/build.Makefile
> > > index 4d3d90ab01ef..f4100bc06347 100644
> > > --- a/scripts/build.Makefile
> > > +++ b/scripts/build.Makefile
> > > @@ -8,6 +8,8 @@ clean: $(clean-subdirs)
> > >
> > > PHONY += mrproper
> > > mrproper:
> > > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/default/
> > > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/user/
> > > @$(Q)rm -rf $(CURDIR)/include/config/
> > > @$(Q)rm -rf $(CURDIR)/include/generated/
> > > @$(Q)rm -f .config
> >
> >
> > --
> > Chuck Lever
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC PATCH] refs: "make mrproper" should clean out generated refs files
2025-03-12 16:30 ` Daniel Gomez
@ 2025-03-12 16:37 ` Daniel Gomez
2025-03-12 17:18 ` Daniel Gomez
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Gomez @ 2025-03-12 16:37 UTC (permalink / raw)
To: Chuck Lever; +Cc: cel, kdevops
On Wed, Mar 12, 2025 at 05:30:30PM +0100, Daniel Gomez wrote:
> On Wed, Mar 12, 2025 at 05:27:06PM +0100, Daniel Gomez wrote:
> > On Wed, Mar 12, 2025 at 11:05:26AM +0100, Chuck Lever wrote:
> > > On 3/12/25 9:00 AM, cel@kernel.org wrote:
> > > > From: Chuck Lever <chuck.lever@oracle.com>
> > > >
> > > > Doing a "make mrproper" should force the regeneration of the
> > > > default and user refs files. Otherwise these become stale because
> > > > kdevops appears to check if they exist, but not if they are newer
> > > > than the source yaml files.
> > > >
> > > > Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> > > > ---
> > > > scripts/build.Makefile | 2 ++
> > > > 1 file changed, 2 insertions(+)
> > > >
> > > > Simple patch, but might be controversial, so I'm posting for comments.
> > >
> > > And my comment is: this breaks things. Please ignore it.
> > >
> > > So what I'm trying to fix is that when I change refs/static/yada.yml,
> > > the default and user refs do not appear to be regenerated, even if
> > > I use "make refs-default". I am probably missing something simple.
> >
> > Yes, that is how it should work. When we change the static files we need to
> > run `make refs-default` to regenerate the files and then you can push them to
> > the tree.
> >
> > Also, docs/kdevops-autorefs.md for more context.
>
> make refs-default V=1
> echo "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
> Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files...
> make REFS_COUNT=0 REFS_DIR="default" gen_refs_mcgrof_linus gen_refs_mcgrof_next gen_refs_modules gen_refs_btrfs_devel gen_refs_cel_linux gen_refs_jlayton_linux gen_refs_kdevops_
> echo "Generating refs/default/Kconfig.mcgrof-linus (0 refs)..."
> Generating refs/default/Kconfig.mcgrof-linus (0 refs)...
> ./scripts/generate_refs.py \
> --prefix BOOTLINUX_TREE_MCGROF_LINUS \
> --output workflows/linux/refs/default/Kconfig.mcgrof-linus \
> --extra workflows/linux/refs/static/mcgrof-linus.yaml \
> --force \
> gitref \
> --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git \
> --refs 0
> echo "Generating refs/default/Kconfig.mcgrof-next (0 refs)..."
> Generating refs/default/Kconfig.mcgrof-next (0 refs)...
> ./scripts/generate_refs.py \
> --prefix BOOTLINUX_TREE_MCGROF_NEXT \
> --output workflows/linux/refs/default/Kconfig.mcgrof-next \
> --extra workflows/linux/refs/static/mcgrof-next.yaml \
> --force \
> gitref \
> --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git \
> --refs 0
> ...
> echo "Generating refs/default/Kconfig.cel-linux (0 refs)..."
> Generating refs/default/Kconfig.cel-linux (0 refs)...
> ./scripts/generate_refs.py \
> --prefix BOOTLINUX_TREE_CEL_LINUX \
> --output workflows/linux/refs/default/Kconfig.cel-linux \
> --extra workflows/linux/refs/static/cel-linux.yaml \
> --force \
> gitref \
> --repo https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git \
> --refs 0
> ...
>
> But I think I remember seeing a typo in CEL and have a commit for it.
Right.
workflows/linux/Kconfig.cel:config BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
workflows/linux/refs/default/Kconfig.cel-linux: default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
workflows/linux/refs/static/cel-linux.yaml: ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
This should be renamed as BOOTLINUX_TREE_CEL_.
Sorry for that Chuck, I forgot to push the change.
>
> >
> > Daniel
> >
> > >
> > >
> > > > diff --git a/scripts/build.Makefile b/scripts/build.Makefile
> > > > index 4d3d90ab01ef..f4100bc06347 100644
> > > > --- a/scripts/build.Makefile
> > > > +++ b/scripts/build.Makefile
> > > > @@ -8,6 +8,8 @@ clean: $(clean-subdirs)
> > > >
> > > > PHONY += mrproper
> > > > mrproper:
> > > > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/default/
> > > > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/user/
> > > > @$(Q)rm -rf $(CURDIR)/include/config/
> > > > @$(Q)rm -rf $(CURDIR)/include/generated/
> > > > @$(Q)rm -f .config
> > >
> > >
> > > --
> > > Chuck Lever
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC PATCH] refs: "make mrproper" should clean out generated refs files
2025-03-12 16:37 ` Daniel Gomez
@ 2025-03-12 17:18 ` Daniel Gomez
2025-03-12 18:46 ` Chuck Lever
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Gomez @ 2025-03-12 17:18 UTC (permalink / raw)
To: Chuck Lever; +Cc: cel, kdevops
On Wed, Mar 12, 2025 at 05:37:41PM +0100, Daniel Gomez wrote:
> On Wed, Mar 12, 2025 at 05:30:30PM +0100, Daniel Gomez wrote:
> > On Wed, Mar 12, 2025 at 05:27:06PM +0100, Daniel Gomez wrote:
> > > On Wed, Mar 12, 2025 at 11:05:26AM +0100, Chuck Lever wrote:
> > > > On 3/12/25 9:00 AM, cel@kernel.org wrote:
> > > > > From: Chuck Lever <chuck.lever@oracle.com>
> > > > >
> > > > > Doing a "make mrproper" should force the regeneration of the
> > > > > default and user refs files. Otherwise these become stale because
> > > > > kdevops appears to check if they exist, but not if they are newer
> > > > > than the source yaml files.
> > > > >
> > > > > Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> > > > > ---
> > > > > scripts/build.Makefile | 2 ++
> > > > > 1 file changed, 2 insertions(+)
> > > > >
> > > > > Simple patch, but might be controversial, so I'm posting for comments.
> > > >
> > > > And my comment is: this breaks things. Please ignore it.
> > > >
> > > > So what I'm trying to fix is that when I change refs/static/yada.yml,
> > > > the default and user refs do not appear to be regenerated, even if
> > > > I use "make refs-default". I am probably missing something simple.
> > >
> > > Yes, that is how it should work. When we change the static files we need to
> > > run `make refs-default` to regenerate the files and then you can push them to
> > > the tree.
> > >
> > > Also, docs/kdevops-autorefs.md for more context.
> >
> > make refs-default V=1
> > echo "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
> > Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files...
> > make REFS_COUNT=0 REFS_DIR="default" gen_refs_mcgrof_linus gen_refs_mcgrof_next gen_refs_modules gen_refs_btrfs_devel gen_refs_cel_linux gen_refs_jlayton_linux gen_refs_kdevops_
> > echo "Generating refs/default/Kconfig.mcgrof-linus (0 refs)..."
> > Generating refs/default/Kconfig.mcgrof-linus (0 refs)...
> > ./scripts/generate_refs.py \
> > --prefix BOOTLINUX_TREE_MCGROF_LINUS \
> > --output workflows/linux/refs/default/Kconfig.mcgrof-linus \
> > --extra workflows/linux/refs/static/mcgrof-linus.yaml \
> > --force \
> > gitref \
> > --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git \
> > --refs 0
> > echo "Generating refs/default/Kconfig.mcgrof-next (0 refs)..."
> > Generating refs/default/Kconfig.mcgrof-next (0 refs)...
> > ./scripts/generate_refs.py \
> > --prefix BOOTLINUX_TREE_MCGROF_NEXT \
> > --output workflows/linux/refs/default/Kconfig.mcgrof-next \
> > --extra workflows/linux/refs/static/mcgrof-next.yaml \
> > --force \
> > gitref \
> > --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git \
> > --refs 0
> > ...
> > echo "Generating refs/default/Kconfig.cel-linux (0 refs)..."
> > Generating refs/default/Kconfig.cel-linux (0 refs)...
> > ./scripts/generate_refs.py \
> > --prefix BOOTLINUX_TREE_CEL_LINUX \
> > --output workflows/linux/refs/default/Kconfig.cel-linux \
> > --extra workflows/linux/refs/static/cel-linux.yaml \
> > --force \
> > gitref \
> > --repo https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git \
> > --refs 0
> > ...
> >
> > But I think I remember seeing a typo in CEL and have a commit for it.
>
> Right.
>
> workflows/linux/Kconfig.cel:config BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
> workflows/linux/refs/default/Kconfig.cel-linux: default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> workflows/linux/refs/static/cel-linux.yaml: ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
>
> This should be renamed as BOOTLINUX_TREE_CEL_.
>
> Sorry for that Chuck, I forgot to push the change.
Let me know if this fixes the problem:
Author: Daniel Gomez <da.gomez@samsung.com>
Date: Wed Mar 12 17:15:15 2025 +0000
linux: refs: fix cel rename types
To be consistent with the rest of the configs, use the BOOTLINUX_TREE_
prefix.
Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
diff --git a/workflows/linux/Kconfig.cel b/workflows/linux/Kconfig.cel
index d07b6a9..a001782 100644
--- a/workflows/linux/Kconfig.cel
+++ b/workflows/linux/Kconfig.cel
@@ -3,7 +3,7 @@ if BOOTLINUX_TREE_CEL_LINUX
source "workflows/linux/refs/default/Kconfig.cel-linux"
source "workflows/linux/refs/user/Kconfig.cel-linux"
-config BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
+config BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME
string "Custom branch name"
default "custom"
depends on BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
diff --git a/workflows/linux/refs/default/Kconfig.cel-linux b/workflows/linux/refs/default/Kconfig.cel-linux
index 56071e6..e7a0c9d 100644
--- a/workflows/linux/refs/default/Kconfig.cel-linux
+++ b/workflows/linux/refs/default/Kconfig.cel-linux
@@ -33,6 +33,6 @@ config BOOTLINUX_TREE_CEL_LINUX_REF
default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_REF_NEXT
default "nfsd-fixes" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES
default "nfsd-testing" if BOOTLINUX_TREE_CEL_LINUX_REF_TESTING
- default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
+ default BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
endif # !HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFS
diff --git a/workflows/linux/refs/static/cel-linux.yaml b/workflows/linux/refs/static/cel-linux.yaml
index 8b94b9f..77ea1ce 100644
--- a/workflows/linux/refs/static/cel-linux.yaml
+++ b/workflows/linux/refs/static/cel-linux.yaml
@@ -14,5 +14,5 @@ configs:
help: "Pull the nfsd-testing branch."
- custom:
config: BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
- ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
+ ref: BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME
help: "Use a custom branch name."
>
> >
> > >
> > > Daniel
> > >
> > > >
> > > >
> > > > > diff --git a/scripts/build.Makefile b/scripts/build.Makefile
> > > > > index 4d3d90ab01ef..f4100bc06347 100644
> > > > > --- a/scripts/build.Makefile
> > > > > +++ b/scripts/build.Makefile
> > > > > @@ -8,6 +8,8 @@ clean: $(clean-subdirs)
> > > > >
> > > > > PHONY += mrproper
> > > > > mrproper:
> > > > > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/default/
> > > > > + @$(Q)rm -rf $(CURDIR)/workflows/linux/refs/user/
> > > > > @$(Q)rm -rf $(CURDIR)/include/config/
> > > > > @$(Q)rm -rf $(CURDIR)/include/generated/
> > > > > @$(Q)rm -f .config
> > > >
> > > >
> > > > --
> > > > Chuck Lever
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [RFC PATCH] refs: "make mrproper" should clean out generated refs files
2025-03-12 17:18 ` Daniel Gomez
@ 2025-03-12 18:46 ` Chuck Lever
2025-03-13 15:12 ` Daniel Gomez
0 siblings, 1 reply; 8+ messages in thread
From: Chuck Lever @ 2025-03-12 18:46 UTC (permalink / raw)
To: Daniel Gomez; +Cc: cel, kdevops
On 3/12/25 1:18 PM, Daniel Gomez wrote:
> On Wed, Mar 12, 2025 at 05:37:41PM +0100, Daniel Gomez wrote:
>> On Wed, Mar 12, 2025 at 05:30:30PM +0100, Daniel Gomez wrote:
>>> On Wed, Mar 12, 2025 at 05:27:06PM +0100, Daniel Gomez wrote:
>>>> On Wed, Mar 12, 2025 at 11:05:26AM +0100, Chuck Lever wrote:
>>>>> On 3/12/25 9:00 AM, cel@kernel.org wrote:
>>>>>> From: Chuck Lever <chuck.lever@oracle.com>
>>>>> So what I'm trying to fix is that when I change refs/static/yada.yml,
>>>>> the default and user refs do not appear to be regenerated, even if
>>>>> I use "make refs-default". I am probably missing something simple.
>>>>
>>>> Yes, that is how it should work. When we change the static files we need to
>>>> run `make refs-default` to regenerate the files and then you can push them to
>>>> the tree.
>>>>
>>>> Also, docs/kdevops-autorefs.md for more context.
>>>
>>> make refs-default V=1
>>> echo "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
>>> Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files...
>>> make REFS_COUNT=0 REFS_DIR="default" gen_refs_mcgrof_linus gen_refs_mcgrof_next gen_refs_modules gen_refs_btrfs_devel gen_refs_cel_linux gen_refs_jlayton_linux gen_refs_kdevops_
>>> echo "Generating refs/default/Kconfig.mcgrof-linus (0 refs)..."
>>> Generating refs/default/Kconfig.mcgrof-linus (0 refs)...
>>> ./scripts/generate_refs.py \
>>> --prefix BOOTLINUX_TREE_MCGROF_LINUS \
>>> --output workflows/linux/refs/default/Kconfig.mcgrof-linus \
>>> --extra workflows/linux/refs/static/mcgrof-linus.yaml \
>>> --force \
>>> gitref \
>>> --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git \
>>> --refs 0
>>> echo "Generating refs/default/Kconfig.mcgrof-next (0 refs)..."
>>> Generating refs/default/Kconfig.mcgrof-next (0 refs)...
>>> ./scripts/generate_refs.py \
>>> --prefix BOOTLINUX_TREE_MCGROF_NEXT \
>>> --output workflows/linux/refs/default/Kconfig.mcgrof-next \
>>> --extra workflows/linux/refs/static/mcgrof-next.yaml \
>>> --force \
>>> gitref \
>>> --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git \
>>> --refs 0
>>> ...
>>> echo "Generating refs/default/Kconfig.cel-linux (0 refs)..."
>>> Generating refs/default/Kconfig.cel-linux (0 refs)...
>>> ./scripts/generate_refs.py \
>>> --prefix BOOTLINUX_TREE_CEL_LINUX \
>>> --output workflows/linux/refs/default/Kconfig.cel-linux \
>>> --extra workflows/linux/refs/static/cel-linux.yaml \
>>> --force \
>>> gitref \
>>> --repo https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git \
>>> --refs 0
>>> ...
>>>
>>> But I think I remember seeing a typo in CEL and have a commit for it.
>>
>> Right.
>>
>> workflows/linux/Kconfig.cel:config BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
>> workflows/linux/refs/default/Kconfig.cel-linux: default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
>> workflows/linux/refs/static/cel-linux.yaml: ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
>>
>> This should be renamed as BOOTLINUX_TREE_CEL_.
>>
>> Sorry for that Chuck, I forgot to push the change.
>
> Let me know if this fixes the problem:
>
> Author: Daniel Gomez <da.gomez@samsung.com>
> Date: Wed Mar 12 17:15:15 2025 +0000
>
> linux: refs: fix cel rename types
>
> To be consistent with the rest of the configs, use the BOOTLINUX_TREE_
> prefix.
>
> Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
>
> diff --git a/workflows/linux/Kconfig.cel b/workflows/linux/Kconfig.cel
> index d07b6a9..a001782 100644
> --- a/workflows/linux/Kconfig.cel
> +++ b/workflows/linux/Kconfig.cel
> @@ -3,7 +3,7 @@ if BOOTLINUX_TREE_CEL_LINUX
> source "workflows/linux/refs/default/Kconfig.cel-linux"
> source "workflows/linux/refs/user/Kconfig.cel-linux"
>
> -config BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
> +config BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME
> string "Custom branch name"
> default "custom"
> depends on BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> diff --git a/workflows/linux/refs/default/Kconfig.cel-linux b/workflows/linux/refs/default/Kconfig.cel-linux
> index 56071e6..e7a0c9d 100644
> --- a/workflows/linux/refs/default/Kconfig.cel-linux
> +++ b/workflows/linux/refs/default/Kconfig.cel-linux
> @@ -33,6 +33,6 @@ config BOOTLINUX_TREE_CEL_LINUX_REF
> default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_REF_NEXT
> default "nfsd-fixes" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES
> default "nfsd-testing" if BOOTLINUX_TREE_CEL_LINUX_REF_TESTING
> - default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> + default BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
>
> endif # !HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFS
> diff --git a/workflows/linux/refs/static/cel-linux.yaml b/workflows/linux/refs/static/cel-linux.yaml
> index 8b94b9f..77ea1ce 100644
> --- a/workflows/linux/refs/static/cel-linux.yaml
> +++ b/workflows/linux/refs/static/cel-linux.yaml
> @@ -14,5 +14,5 @@ configs:
> help: "Pull the nfsd-testing branch."
> - custom:
> config: BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> - ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
> + ref: BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME
> help: "Use a custom branch name."
I applied this. It doesn't break anything. You can add R-b, T-b, or
both from me.
The original problem, though, was I was developing a new set of
default refs for linux-stable-rc, and when I changed the static
yaml file, I had to actively delete the default/ ... file to
get it to reflect changes to the static file.
I will post all that in a bit to help the discussion along.
--
Chuck Lever
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC PATCH] refs: "make mrproper" should clean out generated refs files
2025-03-12 18:46 ` Chuck Lever
@ 2025-03-13 15:12 ` Daniel Gomez
0 siblings, 0 replies; 8+ messages in thread
From: Daniel Gomez @ 2025-03-13 15:12 UTC (permalink / raw)
To: Chuck Lever; +Cc: cel, kdevops
On Wed, Mar 12, 2025 at 02:46:55PM +0100, Chuck Lever wrote:
> On 3/12/25 1:18 PM, Daniel Gomez wrote:
> > On Wed, Mar 12, 2025 at 05:37:41PM +0100, Daniel Gomez wrote:
> >> On Wed, Mar 12, 2025 at 05:30:30PM +0100, Daniel Gomez wrote:
> >>> On Wed, Mar 12, 2025 at 05:27:06PM +0100, Daniel Gomez wrote:
> >>>> On Wed, Mar 12, 2025 at 11:05:26AM +0100, Chuck Lever wrote:
> >>>>> On 3/12/25 9:00 AM, cel@kernel.org wrote:
> >>>>>> From: Chuck Lever <chuck.lever@oracle.com>
>
> >>>>> So what I'm trying to fix is that when I change refs/static/yada.yml,
> >>>>> the default and user refs do not appear to be regenerated, even if
> >>>>> I use "make refs-default". I am probably missing something simple.
> >>>>
> >>>> Yes, that is how it should work. When we change the static files we need to
> >>>> run `make refs-default` to regenerate the files and then you can push them to
> >>>> the tree.
> >>>>
> >>>> Also, docs/kdevops-autorefs.md for more context.
> >>>
> >>> make refs-default V=1
> >>> echo "Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files..."
> >>> Generating refs/default/Kconfig-{mcgrof-linus,mcgrof-next,btrfs-devel,cel-linux-jlayton-linux-kdevops-linus} files...
> >>> make REFS_COUNT=0 REFS_DIR="default" gen_refs_mcgrof_linus gen_refs_mcgrof_next gen_refs_modules gen_refs_btrfs_devel gen_refs_cel_linux gen_refs_jlayton_linux gen_refs_kdevops_
> >>> echo "Generating refs/default/Kconfig.mcgrof-linus (0 refs)..."
> >>> Generating refs/default/Kconfig.mcgrof-linus (0 refs)...
> >>> ./scripts/generate_refs.py \
> >>> --prefix BOOTLINUX_TREE_MCGROF_LINUS \
> >>> --output workflows/linux/refs/default/Kconfig.mcgrof-linus \
> >>> --extra workflows/linux/refs/static/mcgrof-linus.yaml \
> >>> --force \
> >>> gitref \
> >>> --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git \
> >>> --refs 0
> >>> echo "Generating refs/default/Kconfig.mcgrof-next (0 refs)..."
> >>> Generating refs/default/Kconfig.mcgrof-next (0 refs)...
> >>> ./scripts/generate_refs.py \
> >>> --prefix BOOTLINUX_TREE_MCGROF_NEXT \
> >>> --output workflows/linux/refs/default/Kconfig.mcgrof-next \
> >>> --extra workflows/linux/refs/static/mcgrof-next.yaml \
> >>> --force \
> >>> gitref \
> >>> --repo https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git \
> >>> --refs 0
> >>> ...
> >>> echo "Generating refs/default/Kconfig.cel-linux (0 refs)..."
> >>> Generating refs/default/Kconfig.cel-linux (0 refs)...
> >>> ./scripts/generate_refs.py \
> >>> --prefix BOOTLINUX_TREE_CEL_LINUX \
> >>> --output workflows/linux/refs/default/Kconfig.cel-linux \
> >>> --extra workflows/linux/refs/static/cel-linux.yaml \
> >>> --force \
> >>> gitref \
> >>> --repo https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git \
> >>> --refs 0
> >>> ...
> >>>
> >>> But I think I remember seeing a typo in CEL and have a commit for it.
> >>
> >> Right.
> >>
> >> workflows/linux/Kconfig.cel:config BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
> >> workflows/linux/refs/default/Kconfig.cel-linux: default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> >> workflows/linux/refs/static/cel-linux.yaml: ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
> >>
> >> This should be renamed as BOOTLINUX_TREE_CEL_.
> >>
> >> Sorry for that Chuck, I forgot to push the change.
> >
> > Let me know if this fixes the problem:
> >
> > Author: Daniel Gomez <da.gomez@samsung.com>
> > Date: Wed Mar 12 17:15:15 2025 +0000
> >
> > linux: refs: fix cel rename types
> >
> > To be consistent with the rest of the configs, use the BOOTLINUX_TREE_
> > prefix.
> >
> > Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
> >
> > diff --git a/workflows/linux/Kconfig.cel b/workflows/linux/Kconfig.cel
> > index d07b6a9..a001782 100644
> > --- a/workflows/linux/Kconfig.cel
> > +++ b/workflows/linux/Kconfig.cel
> > @@ -3,7 +3,7 @@ if BOOTLINUX_TREE_CEL_LINUX
> > source "workflows/linux/refs/default/Kconfig.cel-linux"
> > source "workflows/linux/refs/user/Kconfig.cel-linux"
> >
> > -config BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
> > +config BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME
> > string "Custom branch name"
> > default "custom"
> > depends on BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> > diff --git a/workflows/linux/refs/default/Kconfig.cel-linux b/workflows/linux/refs/default/Kconfig.cel-linux
> > index 56071e6..e7a0c9d 100644
> > --- a/workflows/linux/refs/default/Kconfig.cel-linux
> > +++ b/workflows/linux/refs/default/Kconfig.cel-linux
> > @@ -33,6 +33,6 @@ config BOOTLINUX_TREE_CEL_LINUX_REF
> > default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_REF_NEXT
> > default "nfsd-fixes" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES
> > default "nfsd-testing" if BOOTLINUX_TREE_CEL_LINUX_REF_TESTING
> > - default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> > + default BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> >
> > endif # !HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFS
> > diff --git a/workflows/linux/refs/static/cel-linux.yaml b/workflows/linux/refs/static/cel-linux.yaml
> > index 8b94b9f..77ea1ce 100644
> > --- a/workflows/linux/refs/static/cel-linux.yaml
> > +++ b/workflows/linux/refs/static/cel-linux.yaml
> > @@ -14,5 +14,5 @@ configs:
> > help: "Pull the nfsd-testing branch."
> > - custom:
> > config: BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM
> > - ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
> > + ref: BOOTLINUX_TREE_CEL_LINUX_CUSTOM_REF_NAME
> > help: "Use a custom branch name."
>
> I applied this. It doesn't break anything. You can add R-b, T-b, or
> both from me.
Ok. I will post soon.
Thanks!
Daniel
>
> The original problem, though, was I was developing a new set of
> default refs for linux-stable-rc, and when I changed the static
> yaml file, I had to actively delete the default/ ... file to
> get it to reflect changes to the static file.
>
> I will post all that in a bit to help the discussion along.
>
>
> --
> Chuck Lever
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-03-13 15:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-12 13:00 [RFC PATCH] refs: "make mrproper" should clean out generated refs files cel
2025-03-12 15:05 ` Chuck Lever
2025-03-12 16:27 ` Daniel Gomez
2025-03-12 16:30 ` Daniel Gomez
2025-03-12 16:37 ` Daniel Gomez
2025-03-12 17:18 ` Daniel Gomez
2025-03-12 18:46 ` Chuck Lever
2025-03-13 15:12 ` Daniel Gomez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox