758644 - Contents/CodeResources isn't included in MARs

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[[e-mail] (:bhearsum)]

This file is a symlink that points to _CodeSignature/CodeResources. After landing bug 723176 and updating from an unsigned build to a signed build, this file wasn't present despite it being in the dmg. I looked at the complete MAR directly and it wasn't there either. I think that the update generation code doesn't what to do with symlinks or something.

Comment 1

[[e-mail] (:bhearsum)]

Attachment: copy CodeResources after signing

I tried this without the 'rm' first, and found that OS X created a symlink to _CodeSignature/CodeResources. Couldn't find a way to make cp overwrite it because it was "the same file".

Comment 2

[[e-mail] (:bhearsum)]

Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

http://hg.mozilla.org/mozilla-central/rev/6aab5d7f2cc7

Comment 3

[[e-mail] (:bhearsum)]

Landed cleanly.

Comment 4

[[e-mail] (:bhearsum)]

Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

This patch ensures consistency between the two possible CodeResources files in .app bundles. It should let 'codesign -vv' pass on more platforms. It's not critical, but low risk and nice to have.

Comment 5

[Alex Keybl [:akeybl]]

Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

[Triage Comment]
Approving for Aurora/Beta, but we should wait to see if this is necessary on the ESR (depends on whether we end up signing that branch).

Comment 6

[[e-mail] (:bhearsum)]

Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

Landed on Aurora & Beta:
https://hg.mozilla.org/releases/mozilla-aurora/rev/b92a17096308
https://tbpl.mozilla.org/?tree=Mozilla-Aurora&rev=b92a17096308
https://hg.mozilla.org/releases/mozilla-beta/rev/6599b65306d2
https://tbpl.mozilla.org/?tree=Mozilla-Beta&rev=6599b65306d2

Comment 7

[Nick Thomas [:nthomas] (UTC+12)]

Standard8, does Thunderbird have somewhere this change should be ported to ? My partial update from 14.0 to 15.0 failed on Mac 10.6.8 with this in the last-update.log:
...
PREPARE PATCH Contents/Info.plist
PREPARE PATCH Contents/CodeResources
PREPARE ADD Contents/MacOS/update-settings.ini
EXECUTE ADD precomplete
EXECUTE PATCH Contents/_CodeSignature/CodeResources
unable to open destination file: Contents/_CodeSignature/CodeResources, err: 2
### execution failed
...

Comment 8

[Nick Thomas [:nthomas] (UTC+12)]

Perhaps that's a red herring, I have
 Contents/CodeResources
 Contents/_CodeSignature/CodeResources
which are both files, and identical. And applying the partial works fine if I reset the update process and make sure I don't have any terminals open in the .app.

Comment 9

[Mark Banner (:standard8)]

(In reply to Nick Thomas [:nthomas] from comment #7)
> Standard8, does Thunderbird have somewhere this change should be ported to ?

Just to answer the question anyway, this code is in toolkit, so we'll pick it up by default anyway.

Comment 10

[Alex Keybl [:akeybl]]

Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

Waiting for ESR17 to roll this out.