Skip to content

[Build] fix make clean#12713

Merged
lguohan merged 2 commits intosonic-net:masterfrom
kv-y:fix_make_clean
Dec 17, 2022
Merged

[Build] fix make clean#12713
lguohan merged 2 commits intosonic-net:masterfrom
kv-y:fix_make_clean

Conversation

@kv-y
Copy link
Copy Markdown
Contributor

@kv-y kv-y commented Nov 15, 2022

Why I did it

make clean is broken after #12000:

bash: -c: line 1: syntax error near unexpected token `;'
bash: -c: line 1: `make -f slave.mk PLATFORM= PLATFORM_ARCH=amd64 MULTIARCH_QEMU_ENVIRON=n 
...
MIRROR_URLS= MIRROR_SECURITY_URLS=  Q=@ clean; ; '
make[1]: *** [Makefile.work:531: clean] Error 2

How I did it

Remove a conditional for clean command.

Signed-off-by: Konstantin Vasin k.vasin@yadro.com

Signed-off-by: Konstantin Vasin <k.vasin@yadro.com>
@kv-y
Copy link
Copy Markdown
Contributor Author

kv-y commented Nov 15, 2022

@Kalimuthu-Velappan

You added this conditional: ifeq ($(filter clean,$(MAKECMDGOALS)),) in #12000.
If it's not for some special purpose then I think we can just remove it to fix make clean command.

Another possible solution is:

  1. Use filter or filter-out not only for clean but for other targets like distclean and list too.
  2. Fix double semicolon error.

@Kalimuthu-Velappan
Copy link
Copy Markdown
Contributor

@Kalimuthu-Velappan

You added this conditional: ifeq ($(filter clean,$(MAKECMDGOALS)),) in #12000. If it's not for some special purpose then I think we can just remove it to fix make clean command.

Another possible solution is:

1. Use filter or filter-out not only for clean but for other targets like distclean and list too.

2. Fix double semicolon error.

You can go ahead and commit the current fix. I will address this in a separate PR.

@lguohan
Copy link
Copy Markdown
Collaborator

lguohan commented Dec 14, 2022

@kv-y , i resolve the conflict, can you check if the pr still good?

@kv-y
Copy link
Copy Markdown
Contributor Author

kv-y commented Dec 14, 2022

You can go ahead and commit the current fix. I will address this in a separate PR.

@Kalimuthu-Velappan
Are you still going to address this bug in a separate PR?
I mean this code filter clean,$(MAKECMDGOALS) was added as part of you PR for vcache.
PR for vcache was merged in #12000 and #12005.

If you don't need a special handling for clean command for vcache framework and it's just for refactoring then we can merge this PR.

@lguohan
Copy link
Copy Markdown
Collaborator

lguohan commented Dec 16, 2022

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@lguohan lguohan merged commit 20cad3b into sonic-net:master Dec 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants