From 777b55e31efa2bcfd680a5e546b29493bdfeb493 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Thu, 3 Aug 2017 15:16:24 -0600 Subject: [PATCH] Bug 1387239 - Use bzip2 mar update compression; r=me We need to generate a nightly with an update that understands xz updates, but that is itself packed with bzip2 updates. That nightly will act as a watershed update. MozReview-Commit-ID: BH29MJM1lDU --HG-- extra : rebase_source : 3221ec704dbbf2898033d67a204b7ce1f6262e99 extra : amend_source : f4209ed6d7e97055240c69f4aa6391bf38203bc8 --- mail/config/mozconfigs/linux32/l10n-mozconfig | 4 ++++ mail/config/mozconfigs/linux32/nightly | 4 ++++ mail/config/mozconfigs/linux64/l10n-mozconfig | 4 ++++ mail/config/mozconfigs/linux64/nightly | 4 ++++ mail/config/mozconfigs/macosx64/l10n-mozconfig | 4 ++++ mail/config/mozconfigs/macosx64/nightly | 4 ++++ mail/config/mozconfigs/win32/l10n-mozconfig | 4 ++++ mail/config/mozconfigs/win32/nightly | 4 ++++ mail/config/mozconfigs/win64/l10n-mozconfig | 4 ++++ mail/config/mozconfigs/win64/nightly | 4 ++++ 10 files changed, 40 insertions(+) diff --git a/mail/config/mozconfigs/linux32/l10n-mozconfig b/mail/config/mozconfigs/linux32/l10n-mozconfig index 658465a129..da070b017c 100644 --- a/mail/config/mozconfigs/linux32/l10n-mozconfig +++ b/mail/config/mozconfigs/linux32/l10n-mozconfig @@ -29,3 +29,7 @@ ac_add_options --disable-stdcxx-compat # Run client.py mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)" mk_add_options ALWAYS_RUN_CLIENT_PY=1 + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/linux32/nightly b/mail/config/mozconfigs/linux32/nightly index a50dd03e90..602fdbb69e 100644 --- a/mail/config/mozconfigs/linux32/nightly +++ b/mail/config/mozconfigs/linux32/nightly @@ -32,3 +32,7 @@ mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $ mk_add_options ALWAYS_RUN_CLIENT_PY=1 . "$topsrcdir/build/mozconfig.cache" + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/linux64/l10n-mozconfig b/mail/config/mozconfigs/linux64/l10n-mozconfig index 37eb8be9f0..e00b06a6ff 100644 --- a/mail/config/mozconfigs/linux64/l10n-mozconfig +++ b/mail/config/mozconfigs/linux64/l10n-mozconfig @@ -30,3 +30,7 @@ ac_add_options --disable-stdcxx-compat # Run client.py mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)" mk_add_options ALWAYS_RUN_CLIENT_PY=1 + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/linux64/nightly b/mail/config/mozconfigs/linux64/nightly index 07f89ccae0..d4d62bec92 100644 --- a/mail/config/mozconfigs/linux64/nightly +++ b/mail/config/mozconfigs/linux64/nightly @@ -32,3 +32,7 @@ mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $ mk_add_options ALWAYS_RUN_CLIENT_PY=1 . "$topsrcdir/build/mozconfig.cache" + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/macosx64/l10n-mozconfig b/mail/config/mozconfigs/macosx64/l10n-mozconfig index 888136868c..6e74ea21b3 100644 --- a/mail/config/mozconfigs/macosx64/l10n-mozconfig +++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig @@ -17,3 +17,7 @@ MOZ_REQUIRE_ADDON_SIGNING=0 # Run client.py mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)" mk_add_options ALWAYS_RUN_CLIENT_PY=1 + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/macosx64/nightly b/mail/config/mozconfigs/macosx64/nightly index c18c3ea9d0..4a55f4a06f 100644 --- a/mail/config/mozconfigs/macosx64/nightly +++ b/mail/config/mozconfigs/macosx64/nightly @@ -39,3 +39,7 @@ mk_add_options ALWAYS_RUN_CLIENT_PY=1 # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262) ac_add_options RUSTFLAGS='-C debuginfo=1' + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/win32/l10n-mozconfig b/mail/config/mozconfigs/win32/l10n-mozconfig index e5d1f44c39..ae237ac112 100644 --- a/mail/config/mozconfigs/win32/l10n-mozconfig +++ b/mail/config/mozconfigs/win32/l10n-mozconfig @@ -30,3 +30,7 @@ mk_export_correct_style INCLUDE # Run client.py mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)" mk_add_options ALWAYS_RUN_CLIENT_PY=1 + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/win32/nightly b/mail/config/mozconfigs/win32/nightly index 278e052202..0f78e136e7 100644 --- a/mail/config/mozconfigs/win32/nightly +++ b/mail/config/mozconfigs/win32/nightly @@ -33,3 +33,7 @@ mk_export_correct_style INCLUDE # Run client.py mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)" mk_add_options ALWAYS_RUN_CLIENT_PY=1 + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/win64/l10n-mozconfig b/mail/config/mozconfigs/win64/l10n-mozconfig index bba0f4b214..f7cacabc07 100644 --- a/mail/config/mozconfigs/win64/l10n-mozconfig +++ b/mail/config/mozconfigs/win64/l10n-mozconfig @@ -29,3 +29,7 @@ mk_export_correct_style INCLUDE # Run client.py mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)" mk_add_options ALWAYS_RUN_CLIENT_PY=1 + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1" diff --git a/mail/config/mozconfigs/win64/nightly b/mail/config/mozconfigs/win64/nightly index c57c5f324e..7ab0d5d2fb 100644 --- a/mail/config/mozconfigs/win64/nightly +++ b/mail/config/mozconfigs/win64/nightly @@ -33,3 +33,7 @@ mk_export_correct_style INCLUDE # Run client.py mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)" mk_add_options ALWAYS_RUN_CLIENT_PY=1 + +# Bug 1387239 +# Use bzip2 mar update compression, to allow upgrading of older nightly builds. +mk_add_options "export MAR_OLD_FORMAT=1"