Bug 1272483 - Remove MOZ_UPDATE_PACKAGING / --enable-update-packaging. rs,a=bustage-fix
authoraleth <aleth@instantbird.org>
Sat, 14 May 2016 10:17:14 +0200
changeset 19318 e569d6a8ce6c
parent 19317 5449a5ce585f
child 19319 e35bb2a7b0ac
push id11878
push useraleth@instantbird.org
push dateSat, 14 May 2016 08:19:09 +0000
treeherdercomm-central@e569d6a8ce6c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1272483
Bug 1272483 - Remove MOZ_UPDATE_PACKAGING / --enable-update-packaging. rs,a=bustage-fix
im/config/mozconfigs/linux/mozconfig
im/config/mozconfigs/linux/mozconfig-release
im/config/mozconfigs/macosx/mozconfig
im/config/mozconfigs/macosx/mozconfig-release
im/config/mozconfigs/win32/mozconfig
im/config/mozconfigs/win32/mozconfig-release
mail/config/mozconfigs/linux32/l10n-mozconfig
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux32/release
mail/config/mozconfigs/linux64/l10n-mozconfig
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/linux64/release
mail/config/mozconfigs/macosx-universal/l10n-mozconfig
mail/config/mozconfigs/macosx-universal/nightly
mail/config/mozconfigs/macosx-universal/release
mail/config/mozconfigs/macosx64/l10n-mozconfig
mail/config/mozconfigs/win32/l10n-mozconfig
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win32/release
mail/config/mozconfigs/win64/l10n-mozconfig
mail/config/mozconfigs/win64/nightly
suite/config/mozconfigs/linux32/l10n-mozconfig
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux32/release-l10n
suite/config/mozconfigs/linux64/l10n-mozconfig
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/linux64/release-l10n
suite/config/mozconfigs/macosx-universal/l10n-mozconfig
suite/config/mozconfigs/macosx-universal/nightly
suite/config/mozconfigs/macosx-universal/release
suite/config/mozconfigs/macosx-universal/release-l10n
suite/config/mozconfigs/macosx64/release-l10n
suite/config/mozconfigs/win32/l10n-mozconfig
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win32/release
suite/config/mozconfigs/win32/release-l10n
--- a/im/config/mozconfigs/linux/mozconfig
+++ b/im/config/mozconfigs/linux/mozconfig
@@ -18,15 +18,14 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 ac_add_options --with-ccache
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
 if [ `date +%m%d` = 1031 -o `date +%m%d` = 1101 ]; then
 ac_add_options --with-branding=im/branding/halloween
 fi
--- a/im/config/mozconfigs/linux/mozconfig-release
+++ b/im/config/mozconfigs/linux/mozconfig-release
@@ -18,14 +18,13 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 ac_add_options --with-ccache
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..
--- a/im/config/mozconfigs/macosx/mozconfig
+++ b/im/config/mozconfigs/macosx/mozconfig
@@ -20,15 +20,14 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-sj10"
 
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
 if [ `date +%m%d` = 1031 -o `date +%m%d` = 1101 ]; then
 ac_add_options --with-branding=im/branding/halloween
 fi
--- a/im/config/mozconfigs/macosx/mozconfig-release
+++ b/im/config/mozconfigs/macosx/mozconfig-release
@@ -20,14 +20,13 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-sj10"
 
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..
--- a/im/config/mozconfigs/win32/mozconfig
+++ b/im/config/mozconfigs/win32/mozconfig
@@ -12,14 +12,13 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 # The Windows 8 SDK is required for gamepad support.
 ac_add_options --disable-gamepad
 ac_add_options --enable-require-all-d3dc-versions
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 
 if [ `date +%m%d` = 1031 -o `date +%m%d` = 1101 ]; then
 ac_add_options --with-branding=im/branding/halloween
 fi
--- a/im/config/mozconfigs/win32/mozconfig-release
+++ b/im/config/mozconfigs/win32/mozconfig-release
@@ -12,12 +12,11 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 # The Windows 8 SDK is required for gamepad support.
 ac_add_options --disable-gamepad
 ac_add_options --enable-require-all-d3dc-versions
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,13 +1,12 @@
 . $topsrcdir/build/unix/mozconfig.linux32
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --with-l10n-base=../../l10n
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,13 +1,12 @@
 . $topsrcdir/build/unix/mozconfig.linux32
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-profiling
 ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/release
@@ -1,13 +1,12 @@
 . $topsrcdir/build/unix/mozconfig.linux32
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,13 +1,12 @@
 . $topsrcdir/build/unix/mozconfig.linux
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --with-l10n-base=../../l10n
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,13 +1,12 @@
 . $topsrcdir/build/unix/mozconfig.linux
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-profiling
 ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/release
@@ -1,13 +1,12 @@
 . $topsrcdir/build/unix/mozconfig.linux
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -1,11 +1,10 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-install-strip
 ac_add_options --with-l10n-base=../../../l10n
 
 # Build lightning locales
 ac_add_options --enable-calendar
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 # Disable checking that add-ons are signed by the trusted root
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -11,17 +11,16 @@ fi
 # the universal mozconfig because Lightning's univeral.mk needs to run first.
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 # Universal builds override the default of mail (bug 575283 comment 29)
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
--- a/mail/config/mozconfigs/macosx-universal/release
+++ b/mail/config/mozconfigs/macosx-universal/release
@@ -11,17 +11,16 @@ fi
 # the universal mozconfig because Lightning's univeral.mk needs to run first.
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 # Universal builds override the default of mail (bug 575283 comment 29)
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/mail/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,11 +1,10 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --with-l10n-base=../../l10n
 
 # Build lightning locales
 ac_add_options --enable-calendar
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -1,13 +1,12 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --with-l10n-base=../../l10n
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@@ -1,16 +1,15 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -1,17 +1,16 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/suite/config/mozconfigs/linux32/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,15 +1,14 @@
 no_tooltool=1
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # For NSS symbols
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,15 +1,14 @@
 no_tooltool=1
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-calendar
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,15 +1,14 @@
 no_tooltool=1
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
--- a/suite/config/mozconfigs/linux64/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,15 +1,14 @@
 no_tooltool=1
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 export LDFLAGS="-static-libstdc++"
 export HOST_LDFLAGS="-static-libstdc++"
 
 # For NSS symbols
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,15 +1,14 @@
 no_tooltool=1
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,16 +1,15 @@
 no_tooltool=1
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 #Use ccache
--- a/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -7,17 +7,16 @@ if test -e "$topsrcdir/suite/config/vers
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig.common
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --disable-install-strip
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
--- a/suite/config/mozconfigs/macosx-universal/nightly
+++ b/suite/config/mozconfigs/macosx-universal/nightly
@@ -10,17 +10,16 @@ fi
 # Make sure Lightning is also unified, this needs to happen before including
 # the universal mozconfig because Lightning's univeral.mk needs to run first.
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-tests
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
--- a/suite/config/mozconfigs/macosx-universal/release
+++ b/suite/config/mozconfigs/macosx-universal/release
@@ -10,17 +10,16 @@ fi
 # Make sure Lightning is also unified, this needs to happen before including
 # the universal mozconfig because Lightning's univeral.mk needs to run first.
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-tests
 ac_add_options --enable-calendar
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
--- a/suite/config/mozconfigs/macosx-universal/release-l10n
+++ b/suite/config/mozconfigs/macosx-universal/release-l10n
@@ -1,12 +1,11 @@
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
--- a/suite/config/mozconfigs/macosx64/release-l10n
+++ b/suite/config/mozconfigs/macosx64/release-l10n
@@ -3,13 +3,12 @@
 if [ "$MOZ_UPDATE_CHANNEL" == "beta" ]; then
   ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
 fi;
 if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
   ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
 fi;
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 
 # Build lightning locales
 ac_add_options --enable-calendar
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
--- a/suite/config/mozconfigs/win32/l10n-mozconfig
+++ b/suite/config/mozconfigs/win32/l10n-mozconfig
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
 # Windows 8 SDK is required for gamepad support
 # 1006630
 ac_add_options --disable-gamepad
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,13 +1,12 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-tests
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Windows 8 SDK is required for gamepad support
 # bug 1005630
 ac_add_options --disable-gamepad
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,13 +1,12 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-tests
 ac_add_options --enable-calendar
 
 # Windows 8 SDK is required for gamepad support
 # bug 1005630
 ac_add_options --disable-gamepad
 
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
 
 # Windows 8 SDK is required for gamepad support
 # bug 1005630
 ac_add_options --disable-gamepad
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1