Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix error in replacement for RUNTIME_NAME #993

Closed
c3d opened this issue Oct 19, 2020 · 0 comments · Fixed by #994
Closed

Fix error in replacement for RUNTIME_NAME #993

c3d opened this issue Oct 19, 2020 · 0 comments · Fixed by #994
Labels
bug Incorrect behaviour needs-review Needs to be assessed by the team.
Projects
Issue backlog

Comments

@c3d
Copy link
Member

c3d commented Oct 19, 2020 •
edited

In PR #902, specifically 966bd57, there is a problem in the replacement variables, which leads to generating a bad kata-collect.sh.

This was found while investigating CI failures on the backport version of the fix. See kata-containers/runtime#3005 (comment).

The problem is that in the old code, RUNTIME_NAME was replaced in a special way: it was replaced by $(TARGET) and not $(RUNTIME_NAME). The solution is to modify the makefile to set RUNTIME_NAME to TARGET.

A regexp search confirmed that this is the only such case remaining (I had found another one earlier), although the same regexp identified a typo in one of the replacements before the commit (that is fixed by the commit).
@c3d c3d added enhancement Improvement to an existing feature needs-review Needs to be assessed by the team. labels Oct 19, 2020
@jodh-intel jodh-intel added this to To do in Issue backlog Oct 19, 2020
@c3d c3d added bug Incorrect behaviour no-backport-needed and removed enhancement Improvement to an existing feature labels Oct 19, 2020
c3d added a commit to c3d/kata-containers that referenced this issue Oct 19, 2020
@c3d
Replace @RUNTIME_NAME@ with the target in generated files
32a1a0c 
In commit 966bd57 for PR kata-containers#902, the makefile was changed to automate
the replacement of user variables. However, one variable was treated
specially in the original `sed` replacements, namely `RUNTIME_NAME`
which was replaced by `$(TARGET)`.

This commit adds the `RUNTIME_NAME` variable to the makefile in order
to ensure that the replacement works correctly.

Fixes: kata-containers#993

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
@c3d c3d mentioned this issue Oct 19, 2020
Merged
@jodh-intel jodh-intel moved this from To do to In progress in Issue backlog Oct 19, 2020
c3d added a commit to c3d/kata-containers that referenced this issue Oct 19, 2020
@c3d
Makefile: Replace @RUNTIME_NAME@ with the target in generated files
ae2dc8b 
In commit 966bd57 for PR kata-containers#902, the makefile was changed to automate
the replacement of user variables. However, one variable was treated
specially in the original `sed` replacements, namely `RUNTIME_NAME`
which was replaced by `$(TARGET)`.

This commit adds the `RUNTIME_NAME` variable to the makefile in order
to ensure that the replacement works correctly.

Fixes: kata-containers#993

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
c3d added a commit to c3d/kata-containers that referenced this issue Oct 19, 2020
@c3d
Makefile: Replace @RUNTIME_NAME@ with the target in generated files
96a4ed7 
In commit 966bd57 for PR kata-containers#902, the makefile was changed to automate
the replacement of user variables. However, one variable was treated
specially in the original `sed` replacements, namely `RUNTIME_NAME`
which was replaced by `$(TARGET)`.

This commit adds the `RUNTIME_NAME` variable to the makefile in order
to ensure that the replacement works correctly.

Fixes: kata-containers#993

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
Issue backlog automation moved this from In progress to Done Oct 20, 2020
c3d added a commit that referenced this issue Apr 12, 2021
@c3d
Makefile: Replace @RUNTIME_NAME@ with the target in generated files
c791697 
In commit 966bd57 for PR #902, the makefile was changed to automate
the replacement of user variables. However, one variable was treated
specially in the original `sed` replacements, namely `RUNTIME_NAME`
which was replaced by `$(TARGET)`.

This commit adds the `RUNTIME_NAME` variable to the makefile in order
to ensure that the replacement works correctly.

Fixes: #993

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
c3d added a commit to c3d/kata-containers that referenced this issue Apr 12, 2021
@c3d
Makefile: Replace @RUNTIME_NAME@ with the target in generated files
2415245 
In commit 966bd57 for PR kata-containers#902, the makefile was changed to automate
the replacement of user variables. However, one variable was treated
specially in the original `sed` replacements, namely `RUNTIME_NAME`
which was replaced by `$(TARGET)`.

This commit adds the `RUNTIME_NAME` variable to the makefile in order
to ensure that the replacement works correctly.

Fixes: kata-containers#993

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
c3d added a commit to c3d/kata-containers that referenced this issue Apr 27, 2021
@c3d
Makefile: Replace @RUNTIME_NAME@ with the target in generated files
a8137ee 
In commit 966bd57 for PR kata-containers#902, the makefile was changed to automate
the replacement of user variables. However, one variable was treated
specially in the original `sed` replacements, namely `RUNTIME_NAME`
which was replaced by `$(TARGET)`.

This commit adds the `RUNTIME_NAME` variable to the makefile in order
to ensure that the replacement works correctly.

Fixes: kata-containers#993
Fixes: kata-containers#1164

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
(cherry-picked from 96a4ed7)
@c3d c3d mentioned this issue Apr 27, 2021
Merged
@katacontainersbot katacontainersbot moved this from Done to In progress in Issue backlog Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Incorrect behaviour needs-review Needs to be assessed by the team.
Projects
Issue backlog
  
In progress
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Replace @RUNTIME_NAME@ with the target in generated files c3d/kata-containers
1 participant
@c3d