Note: There are a few cases of duplicates in user autocompletion which are being worked on.

should generate NSS checksum files even if --disable-install-strip

VERIFIED FIXED in mozilla1.9.3a1

Status

()

Core
Build Config
VERIFIED FIXED
8 years ago
8 years ago

People

(Reporter: ted, Assigned: ted)

Tracking

Trunk
mozilla1.9.3a1
x86
Mac OS X
Points:
---
Dependency tree / graph
Bug Flags:
blocking1.9.2 +

Firefox Tracking Flags

(status1.9.2 beta3-fixed, status1.9.1 .6-fixed)

Details

Attachments

(1 attachment, 2 obsolete attachments)

(Assignee)

Description

8 years ago
Currently, if you build a Universal OS X build with --disable-install-strip, we remove the NSS .chk files from each architecture-specific side of the build, then fail to regenerate them when building the universal package:
http://mxr.mozilla.org/mozilla1.9.2/source/toolkit/mozapps/installer/packager.mk#386

The packager should regenerate them. We could either do it unconditionally (which would make us regenerate them when we don't need to, not sure if that's a problem) or we could test for their existence and regenerate if they don't exist.
As long as the chk files in the dmg and the complete.mar are the same I don't mind.
(Assignee)

Comment 2

8 years ago
Created attachment 406693 [details] [diff] [review]
works, but ugly

This works, but it is ugly even by packager.mk standards. I think I can make it suck a little less with $(wildcard) if I'm careful.
Assignee: nobody → ted.mielczarek
Status: NEW → ASSIGNED
(Assignee)

Comment 3

8 years ago
Created attachment 406728 [details] [diff] [review]
ifdef to victory

Better. Judicious use of ifdefs to get rid of the shell ugliness.
Attachment #406693 - Attachment is obsolete: true
Attachment #406728 - Flags: review?(benjamin)
(Assignee)

Comment 4

8 years ago
Created attachment 406729 [details] [diff] [review]
ifdef to victory, for real

Oops, qref'ed properly this time.
Attachment #406728 - Attachment is obsolete: true
Attachment #406729 - Flags: review?(benjamin)
Attachment #406728 - Flags: review?(benjamin)
(Assignee)

Comment 5

8 years ago
I built a clobber universal build on my Mac with this patch, and --disable-install-strip in the mozconfig, and verified that the checksum files are present in the generated DMG.

Updated

8 years ago
Blocks: 523494

Updated

8 years ago
No longer blocks: 523494

Updated

8 years ago
Blocks: 503418
Attachment #406729 - Flags: review?(benjamin) → review+
(Assignee)

Comment 6

8 years ago
Pushed to m-c:
http://hg.mozilla.org/mozilla-central/rev/152507b9c592

Did we --disable-install-strip on 1.9.{1,2}? Will we need to take this patch there? It's pretty harmless in general, since it only affects this exact case. (OS X Universal build with --disable-install-strip.)
Status: ASSIGNED → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED

Updated

8 years ago
Blocks: 522041
It's used on on 1.9.1 and 1.9.2 too
http://hg.mozilla.org/build/buildbot-configs/file/41aa61208fc3/mozilla2/macosx/mozilla-1.9.1/nightly/mozconfig#l8
and 1.9.2 is symlinked to the central nightly mozconfig. We should probably take the patch on those branches too.
(Assignee)

Comment 8

8 years ago
Comment on attachment 406729 [details] [diff] [review]
ifdef to victory, for real

Simple patch, only affects this particular build configuration (OS X Universal builds with --disable-install-strip), which happen to be what we're shipping now. We either need to take this or turn this setting off, or we'll break FIPS mode.
Attachment #406729 - Flags: approval1.9.2?
Attachment #406729 - Flags: approval1.9.1.5?
We're only using --disable-install-strip for nightlies and shark builds right now, rather than "shipping" builds.
(Assignee)

Comment 10

8 years ago
Ah, ok. Well, we should still either take this patch or turn that off, since we're shipping nightlies without FIPS support in the current configuration.
Comment on attachment 406729 [details] [diff] [review]
ifdef to victory, for real

Approved for 1.9.1.6, a=dveditz for release-drivers
Attachment #406729 - Flags: approval1.9.1.6? → approval1.9.1.6+
Flags: blocking1.9.2?
FIPS mode works as expected with Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.3a1pre) Gecko/20091104 Minefield/3.7a1pre. Marking as verified.
Status: RESOLVED → VERIFIED
status1.9.1: --- → ?
Target Milestone: --- → mozilla1.9.3a1
(Assignee)

Comment 13

8 years ago
Pushed to 1.9.1:
http://hg.mozilla.org/releases/mozilla-1.9.1/rev/78e753a87244

Marked blocking1.9.2 since this is on 1.9.1 and trunk but not 1.9.2. Still would like explicit approval, though.
status1.9.1: ? → .6-fixed
Flags: blocking1.9.2? → blocking1.9.2+
Comment on attachment 406729 [details] [diff] [review]
ifdef to victory, for real

(this is a blocker, doesn't need explicit approval, please land ASAP)
Attachment #406729 - Flags: approval1.9.2?
(Assignee)

Comment 15

8 years ago
To be fair, I marked it as a blocker myself, but felt squeamish then landing my own patch without approval. :)
(Assignee)

Comment 16

8 years ago
Pushed to 1.9.2:
http://hg.mozilla.org/releases/mozilla-1.9.2/rev/b0899f6d3c4d
status1.9.2: --- → final-fixed
You need to log in before you can comment on or make changes to this bug.