Bug 41306,41307: Resolve templates before sorting and making unique container deps

Merge Info

Issues

Resolves

• #41306 (closed)
• #41307 (closed)

Related

• #41308

Merging

Target Branches

• main: esr128-14.5
• maint-14.0: esr128-14.0
• maint-13.5: esr115-13.5

Backporting

Timeline

• No Backport (preferred): patchset for the next major stable
• Immediate: patchset needed as soon as possible
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

• Emergency security update: patchset fixes CVEs, 0-days, etc
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Other: please explain

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : clairehurst, dan
  • build system : boklm
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, morgan
  • localization : henry, pierov
  • macOS : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : boklm, dan, ma1, morgan, pierov
  • security : jwilde, ma1
  • signing : boklm, morgan
  • updater : pierov
  • windows : jwilde, morgan
  • misc/other : morgan, pierov

Change Description

This MR switches to resolving templates before sorting the container dependencies, and to removing duplicate dependencies if var/sort_deps. Beware that this MR triggers an almost complete rebuild of the toolchain as it changes the pre script of containers at least due to #41308.

How Tested

Built the Tor Browser for linux-x86_64 using this patch, which introduce one duplicate and one templated dependency. It then makes creating the first container fail, so you can cat pre and see how dependencies are arranged.