Bug 1083683 - Source bundle: Sign the hash of the bundle, not the full bundle. r=mshal
authorMassimo Gervasini <mgervasini@mozilla.com>
Tue, 23 Dec 2014 10:33:00 -0500
changeset 221112 6023a740baffc5c890610ab7f77eef383cc985b9
parent 221111 17ef31ab4f7750f5bcdafbab2af1c58148d1db73
child 221113 1731ab46c54612335a3242bea727ae2cc7c8ddc9
push id28010
push userkwierso@gmail.com
push dateWed, 24 Dec 2014 00:29:29 +0000
treeherdermozilla-central@8b881bea204a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1083683
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1083683 - Source bundle: Sign the hash of the bundle, not the full bundle. r=mshal
toolkit/mozapps/installer/packager.mk
toolkit/mozapps/installer/upload-files.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -194,17 +194,15 @@ upload: checksum
 		$(CHECKSUM_FILES)
 
 # source-package creates a source tarball from the files in MOZ_PKG_SRCDIR,
 # which is either set to a clean checkout or defaults to $topsrcdir
 source-package:
 	@echo 'Packaging source tarball...'
 	$(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH)
 	(cd $(MOZ_PKG_SRCDIR) && $(CREATE_SOURCE_TAR) - $(DIR_TO_BE_PACKAGED)) | bzip2 -vf > $(SOURCE_TAR)
-	$(SIGN_SOURCE_TAR_CMD)
 
 hg-bundle:
 	$(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH)
 	$(CREATE_HG_BUNDLE_CMD)
-	$(SIGN_HG_BUNDLE_CMD)
 
 source-upload:
 	$(MAKE) upload UPLOAD_FILES='$(SOURCE_UPLOAD_FILES)' CHECKSUM_FILE='$(SOURCE_CHECKSUM_FILE)'
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -754,17 +754,8 @@ HG ?= hg
 CREATE_HG_BUNDLE_CMD  = $(HG) -v -R $(topsrcdir) bundle --base null
 ifdef HG_BUNDLE_REVISION
 CREATE_HG_BUNDLE_CMD += -r $(HG_BUNDLE_REVISION)
 endif
 CREATE_HG_BUNDLE_CMD += $(HG_BUNDLE_FILE)
 ifdef UPLOAD_HG_BUNDLE
 SOURCE_UPLOAD_FILES  += $(HG_BUNDLE_FILE)
 endif
-
-ifdef MOZ_SIGN_CMD
-SIGN_SOURCE_TAR_CMD  = $(MOZ_SIGN_CMD) -f gpg $(SOURCE_TAR)
-SOURCE_UPLOAD_FILES += $(SOURCE_TAR).asc
-SIGN_HG_BUNDLE_CMD   = $(MOZ_SIGN_CMD) -f gpg $(HG_BUNDLE_FILE)
-ifdef UPLOAD_HG_BUNDLE
-SOURCE_UPLOAD_FILES += $(HG_BUNDLE_FILE).asc
-endif
-endif