Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

kernel: Fix patch ordering#1005

Merged
chavafg merged 1 commit into
kata-containers:masterfrom
jodh-intel:fix-patch-ordering
Apr 8, 2020
Merged

kernel: Fix patch ordering#1005
chavafg merged 1 commit into
kata-containers:masterfrom
jodh-intel:fix-patch-ordering

Conversation

@jodh-intel
Copy link
Copy Markdown

Fix the build-kernel.sh script to sort patches correctly. Previously,
it relied on find(1) for the ordering. However, find(1) does not
guarantee any ordering of files within a directory. Since the ordering
could therefore be "random", it was quite possible for patches to be
applied in the wrong order, resulting in conflicts.

Fixes: #1003.

Signed-off-by: James O. D. Hunt james.o.hunt@intel.com

Copy link
Copy Markdown
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jodh-intel
Copy link
Copy Markdown
Author

/test

@chavafg
Copy link
Copy Markdown
Contributor

chavafg commented Apr 8, 2020

@jodh-intel can you please bump version in kernel/kata_config_version

Fix the `build-kernel.sh` script to sort patches correctly. Previously,
it relied on `find(1)` for the ordering. However, `find(1)` does not
guarantee any ordering of files within a directory. Since the ordering
could therefore be "random", it was quite possible for patches to be
applied in the wrong order, resulting in conflicts.

Fixes: kata-containers#1003.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
@jodh-intel jodh-intel force-pushed the fix-patch-ordering branch from 5cd4041 to 93da145 Compare April 8, 2020 13:22
@jodh-intel
Copy link
Copy Markdown
Author

@chavafg - done 😄

/test

@chavafg
Copy link
Copy Markdown
Contributor

chavafg commented Apr 8, 2020

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 2 pipeline(s).

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Kernel patches are not sorted correctly

4 participants