Backed out changeset 484c20783a1b (bug 1338099) for causing bug 1342383 FIREFOX_52_0esr_BUILD4 FIREFOX_52_0esr_RELEASE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 03 Mar 2017 11:21:45 +0100
changeset 496020 15d9d940341f02ef6dcad96899d284619d3d48db
parent 493162 9ddc2f6bc37d8a4eab32c59823e11d2b4d68d61e
child 496021 4e31b2e7f40ada2e86e85b0ecaeedeee2b16d2cc
push id48512
push userbmo:tom@mozilla.com
push dateThu, 09 Mar 2017 18:57:11 +0000
bugs1338099, 1342383
milestone52.0
backs out484c20783a1b530cc00c9e2a2cd93ebf3026d2e3
Backed out changeset 484c20783a1b (bug 1338099) for causing bug 1342383
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -95,17 +95,18 @@ make-package-internal: prepare-package m
 
 make-package: FORCE
 	$(MAKE) make-package-internal
 	$(TOUCH) $@
 
 GARBAGE += make-package
 
 make-sourcestamp-file::
-	@awk '$$2 == "MOZ_BUILDID" {print $$3}' $(DEPTH)/buildid.h > $(MOZ_SOURCESTAMP_FILE)
+	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
+	@echo '$(BUILDID)' > $(MOZ_SOURCESTAMP_FILE)
 ifdef MOZ_INCLUDE_SOURCE_INFO
 	@awk '$$2 == "MOZ_SOURCE_URL" {print $$3}' $(DEPTH)/source-repo.h >> $(MOZ_SOURCESTAMP_FILE)
 endif
 
 .PHONY: make-buildinfo-file
 make-buildinfo-file:
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/informulate.py \
 		$(MOZ_BUILDINFO_FILE) \
@@ -225,17 +226,17 @@ 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 'Generate the sourcestamp file'
 	# Make sure to have repository information available and then generate the
 	# sourcestamp file.
-	$(MAKE) -C $(DEPTH) 'source-repo.h' 'buildid.h'
+	$(MAKE) -C $(DEPTH) 'source-repo.h'
 	$(MAKE) make-sourcestamp-file
 	@echo 'Packaging source tarball...'
 	# We want to include the sourcestamp file in the source tarball, so copy it
 	# in the root source directory. This is useful to enable telemetry submissions
 	# from builds made from the source package with the correct revision information.
 	# Don't bother removing it as this is only used by automation.
 	@cp $(MOZ_SOURCESTAMP_FILE) '$(MOZ_PKG_SRCDIR)/sourcestamp.txt'
 	$(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH)