Skip to content

Fix prod build Makefile.work #24955

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
Open
tirupatihemanth wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix prod build Makefile.work #24955

tirupatihemanth wants to merge 2 commits into from

Conversation

@tirupatihemanth
Copy link
Contributor

@tirupatihemanth tirupatihemanth commented Dec 30, 2025

Why I did it

when we check the processes being executed on the slave container we see that the quotes for SECURE_UPGRADE_PROD_TOOL_ARGS are gone and this resulting in the following error

07:41:33  make[3]: Entering directory '/sonic/src/sonic-linux-kernel/linux-6.12.41'
07:41:33  make[3]: *** No rule to make target '-c\'.  Stop.
07:41:33  make[3]: Leaving directory '/sonic/src/sonic-linux-kernel/linux-6.12.41'
07:41:33  make[2]: *** [debian/rules:65: build-indep] Error 2
07:41:33  make[2]: Leaving directory '/sonic/src/sonic-linux-kernel/linux-6.12.41'
07:41:33  dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
07:41:33  make[1]: *** [Makefile:50: /sonic/target/debs/trixie/linux-headers-6.12.41+deb13-common-sonic_6.12.41-1_all.deb] Error 2

Here is the ps output showing the slave.mk process that's being executed.

htirupa+       8  4.9  0.0  12748 12064 pts/0    S+   08:06   0:02 make -f slave.mk PLATFORM= PLATFORM_ARCH=amd64 MULTIARCH_QEMU_ENVIRON=n TARGET_BOOTLOADER=grub CROSS_BUILD_ENVIRON=n BUILD_NUMBER= 
...
SECURE_UPGRADE_DEV_SIGNING_KEY=key.pem 
SECURE_UPGRADE_SIGNING_CERT=cert.pem 
SECURE_UPGRADE_KERNEL_CAFILE=cert-prod.pem SECURE_UPGRADE_PROD_SIGNING_TOOL=signing_secure_boot_prod.sh 
SECURE_UPGRADE_PROD_TOOL_ARGS=-m prod -c ****  SONIC_DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io/ ENABLE_HOST_SERVICE_ON_START=y SONIC_BUILD_TARGET=target/debs/trixie/linux-headers-6.12.41+deb13-common-sonic_6.12.41-1_all.deb

How I did it

Fix Makefile.work to correctly pass SECURE_UPGRADE_PROD_TOOL_ARGS to slave.mk

How to verify it

We shouldn't see the above error when building linux headers package prod build

Copilot AI review requested due to automatic review settings December 30, 2025 22:43
@mssonicbld
Copy link
Collaborator

mssonicbld commented Dec 30, 2025

/azp run Azure.sonic-buildimage

Copilot AI reviewed Dec 30, 2025
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes a build failure in production kernel builds caused by incorrect handling of the SECURE_UPGRADE_PROD_TOOL_ARGS variable. The issue manifested as make command-line parsing problems where quotes were being stripped, resulting in arguments being incorrectly interpreted.

Key Changes:

  • Removed problematic quoting of SECURE_UPGRADE_PROD_TOOL_ARGS from the make command line
  • Added the variable as a Docker environment variable to preserve argument integrity
  • Exported the variable to make it available to child processes

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@azure-pipelines
Copy link

azure-pipelines bot commented Dec 30, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@vivekrnv
Copy link
Contributor

vivekrnv commented Jan 2, 2026

Should be backported to 202511 after Trixie changes are backported. @saiarcot895 FYI

@vivekrnv vivekrnv closed this Jan 2, 2026
@vivekrnv vivekrnv reopened this Jan 2, 2026
@mssonicbld
Copy link
Collaborator

mssonicbld commented Jan 2, 2026

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 2, 2026

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms
Copy link
Contributor

bingwang-ms commented Jan 5, 2026

@tirupatihemanth Can you sync up code with master branch?

@tirupatihemanth
Fix prod build Makefile.work
c12c821 
Signed-off-by: Hemanth Kumar Tirupati <htirupati@nvidia.com>
@tirupatihemanth
Copy link
Contributor Author

tirupatihemanth commented Jan 5, 2026

@bingwang-ms done

@mssonicbld
Copy link
Collaborator

mssonicbld commented Jan 5, 2026

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 5, 2026

Azure Pipelines successfully started running 1 pipeline(s).

Copilot AI review requested due to automatic review settings January 5, 2026 18:39
@mssonicbld
Copy link
Collaborator

mssonicbld commented Jan 5, 2026

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 5, 2026

Azure Pipelines successfully started running 1 pipeline(s).

Copilot AI reviewed Jan 5, 2026
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@mssonicbld
Copy link
Collaborator

mssonicbld commented Jan 5, 2026

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 5, 2026

Azure Pipelines successfully started running 1 pipeline(s).

Copilot AI review requested due to automatic review settings January 6, 2026 19:34
@mssonicbld
Copy link
Collaborator

mssonicbld commented Jan 6, 2026

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jan 6, 2026

Azure Pipelines successfully started running 1 pipeline(s).

Copilot AI reviewed Jan 6, 2026
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

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

Reviewers

Copilot code review Copilot Copilot left review comments

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft qiluo-msft is a code owner

@xumia xumia Awaiting requested review from xumia xumia is a code owner

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

+2 more reviewers

@saiarcot895 saiarcot895 saiarcot895 approved these changes

@vivekrnv vivekrnv vivekrnv approved these changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

Request for 202511 Branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tirupatihemanth @mssonicbld @vivekrnv @bingwang-ms @saiarcot895 @kperumalbfn