1913633 - Port bug 1458385 - Update SeaMonkey's confvars.sh

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, task)

Description

[Ian Neal]

Port the relevant changes from:

• Bug 1458385 - Repackage signed windows builds on linux.

Comment 1

[Ian Neal]

Attachment: 1913633-mar-channel-ids-25320.patch

[Approval Request Comment]
Regression caused by (bug #): 1458385
User impact if declined: none
Testing completed (on m-c, etc.): 2.53.20
Risk to taking this patch (and alternatives if risky): low
String changes made by this patch: none

Comment 2

[Frank-Rainer Grahl (:frg)]

Without further config changes the MAR_CHANNEL_ID and ACCEPTED_MAR_CHANNEL_IDS are now empty. build/update-settings.ini among others is also missing the information. Isn't this needed for updates and if yes do we now need to set it externally too for release builds?

Comment 3

[Ian Neal]

Edmund may have a better idea, as he generates the mar files
Edmund what is your process for this and does it make use of MAR_CHANNEL_ID or ACCEPTED_MAR_CHANNEL_IDS?
I'm not sure we should be using seamonkey-comm-central, maybe seamonkey-comm-release?

Comment 4

[Edmund Wong (:ewong)]

(In reply to Ian Neal from comment #3)

Edmund may have a better idea, as he generates the mar files
Edmund what is your process for this and does it make use of MAR_CHANNEL_ID or ACCEPTED_MAR_CHANNEL_IDS?
I'm not sure we should be using seamonkey-comm-central, maybe seamonkey-comm-release?

Actually, the mar files ( complete.mar) are generated during the build; but that said, I don't use either environment variable.s Also since we don't use c-c anymore, there's little point in using it. Use seamonkey-comm-release.

Comment 5

[Edmund Wong (:ewong)]

(In reply to Frank-Rainer Grahl (:frg) from comment #2)

Without further config changes the MAR_CHANNEL_ID and ACCEPTED_MAR_CHANNEL_IDS are now empty. build/update-settings.ini among others is also missing the information. Isn't this needed for updates and if yes do we now need to set it externally too for release builds?

As mentioned to Ian, the build process generates the mar and I believe MAR_CHANNEL_ID is needed. I'm not entirely sure of the latter env. var. I think we need to have that set of information moved into our tree.

Comment 6

[Frank-Rainer Grahl (:frg)]

Attachment: 1913633-mar-addendum-ids-25320.patch

mar generation with the orginal patches is broken e.g. mach build createmar-en-US
I needed to define the channel id. If we want to switch to seamonkey-comm-release we still need to allow seamonkey-comm-central. I couldn't test the actual update but if I am not wrong it will only update an accepted channel. If patch is good can be merged. No need for a separate one.

Comment 7

[Frank-Rainer Grahl (:frg)]

Attachment: 1913633-mar-mc-addendum-id-25320.patch

Fix for our 2.53 m-c repo only.

Comment 8

[Ian Neal]

Comment on attachment 9430229 [details] [diff] [review]
1913633-mar-addendum-ids-25320.patch

Review of attachment 9430229 [details] [diff] [review]:
-----------------------------------------------------------------

Works with testing on linux

Comment 9

[Frank-Rainer Grahl (:frg)]

Attachment: 1913633-mar-channel-ids-1_1-25320.patch

r/a+ for mar patch with addendum integrated. Manual updates tested by IanN. The next release will show if this works 100%. Afterwards we can probably remove the old comm-central reference as accepted mar channel.

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/25a6063945a5
Move MAR_CHANNEL_ID to moz.configure for suite. r=frg

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/5e03933dade5
Only use define and old configre setting for MAR channel ids. r=frg