Fix full .mar creation for esr78

In !13 (merged) we updated the toolchains for building 78esr. This was successful except the creation of mar files is failing.

Adding file and directory remove instructions from file 'removed-files'
Finished create-tor-browser_th
Running create-tor-browser_zh-TW
ERROR: Version not specified (pass `-V <version>`).
mv: cannot stat `/var/tmp/dist/tor-browser/tor-browser_ru/Browser.work/output.mar': No such file or directory

changed the description

mentioned in issue #34227 (closed)

changed milestone to %Tor Browser: 10.0

added 1 deleted label

changed time estimate to 2h

This is caused by the change made for https://bugzilla.mozilla.org/show_bug.cgi?id=1577760 (Don't compile in version of mar-channel-id in mar tool). The Tor Browser build process needs to be modified to set two env vars before running make_full_update.sh and make_incremental_update.sh: MOZ_PRODUCT_VERSION and MAR_CHANNEL_ID.

Thanks @mcs !

For comparison (mach repackage mar):
https://searchfox.org/mozilla-esr78/source/python/mozbuild/mozbuild/mach_commands.py#1497
https://searchfox.org/mozilla-esr78/source/python/mozbuild/mozbuild/repackaging/mar.py#65

Mark Smith:

Mark Smith commented:

This is caused by the change made for https://bugzilla.mozilla.org/show_bug.cgi?id=1577760 (Don't compile in version of mar-channel-id in mar tool). The Tor Browser build process needs to be modified to set two env vars before running make_full_update.sh and make_incremental_update.sh: MOZ_PRODUCT_VERSION and MAR_CHANNEL_ID.

That means we can essentially remove the changes in your patch for #13379 that are related to that, right?

+#ifdef TOR_BROWSER_UPDATE
+  char* MARChannelID = MAR_CHANNEL_ID;
+  char* productVersion = TOR_BROWSER_VERSION_QUOTED;
+#else
   char* MARChannelID = NULL;
   char* productVersion = NULL;
+#endif
   int rv = -1;

That means we can essentially remove the changes in your patch for #13379 that are related to that, right?

Yes, we should follow Mozilla's lead and not include hard-coded values in the mar tool. I opened tor-browser#40036 (closed).

mentioned in merge request !15 (merged)

Okay, I went for fixing the full .mar update only in this ticket and would fix the incremental one in a new ticket. It makes it easier for me to test my fix with functional full updates.

If that sounds good, I'll adjust the description of this ticket.

I'm okay with that.

changed title from Fix mar creation for esr78 to Fix full .mar creation for esr78

added 2h of time spent at 2020-07-21

mentioned in issue tor-browser#40036 (closed)

closed via merge request !15 (merged)

mentioned in issue #40027 (closed)

mentioned in issue #40028 (closed)

mentioned in merge request tor-browser!14 (merged)

mentioned in issue #40032 (closed)