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.

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

debos: Don't remove extra_packages #2402

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

broonie
Copy link
Member

@broonie broonie commented Feb 21, 2024

The strip.sh script is passed a list of packages to remove. For very
unclear reasons the list that is passed by debos is the extra_packages
list but this is a list of packages we want in the shipped image, there
is a separate extra_packages_remove which is intended for removal which
we already handle with a separate debos step. Just remove the argument
and it's handling from strip.sh, ensuring that we don't remove
extra_packages.

This hasn't been apparent because strip.sh only takes effect for ext4
images, we don't use those images for many platforms. That is a
separate issue which should also be addressed.

Signed-off-by: Mark Brown [email protected]

The strip.sh script is passed a list of packages to remove.  For very
unclear reasons the list that is passed by debos is the extra_packages
list but this is a list of packages we want in the shipped image, there
is a separate extra_packages_remove which is intended for removal which
we already handle with a separate debos step.  Just remove the argument
and it's handling from strip.sh, ensuring that we don't remove
extra_packages.

This hasn't been apparent because strip.sh only takes effect for ext4
images, we don't use those images for many platforms.  That is a
separate issue which should also be addressed.

Signed-off-by: Mark Brown <[email protected]>
@nuclearcat
Copy link
Member

Tested and built rootfs with this changes

@nuclearcat nuclearcat added this pull request to the merge queue Feb 23, 2024
Merged via the queue into kernelci:main with commit e64196c Feb 23, 2024
4 checks passed
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.

3 participants