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

Fix distclean for bookworm #18084

Merged
merged 1 commit into from
Mar 29, 2024
Merged

Fix distclean for bookworm #18084

merged 1 commit into from
Mar 29, 2024

Conversation

k-v1
Copy link
Contributor

@k-v1 k-v1 commented Feb 11, 2024

Why I did it

make distclean is broken because FIPS support is not yet available on Bookworm

make distclean
+++ --- Making distclean --- +++
./scripts/run_with_retry make BLDENV=bookworm -f Makefile.work distclean
make[1]: Entering directory '/home/konstantin/Develop/sonic-buildimage'
Makefile.work:195: FIPS support not yet available on Bookworm
...
make: *** No rule to make target 'target/debs/bookworm/symcrypt-openssl_0.10_amd64.deb-clean', needed by 'target/debs/bookworm/openssl_1.1.1n-0+deb11u5+fips_amd64.deb-clean'.  Stop.
make[1]: *** [Makefile.work:629: distclean] Error 2
Work item tracking
  • Microsoft ADO (number only):

How I did it

Add FIPS packages to the list of SONIC_EXTRA_DEBS only if INCLUDE_FIPS=y

How to verify it

make target/docker-base-bookworm.gz
make distclean

Make sure distclean is finished without errors.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@lguohan lguohan merged commit 604cae0 into sonic-net:master Mar 29, 2024
19 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