wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 763632: Only GPG sign .checksum files. r=rail,khuey

Browse Source
This commit is contained in:
Chris AtLee 2012-06-15 09:29:32 -04:00
parent 630362934d
commit 0ac7343973
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/installer/packager.mk
View File

@ -992,7 +992,6 @@ UPLOAD_FILES= \
SIGN_CHECKSUM_CMD=
ifdef MOZ_SIGN_CMD
ifeq (gpg,$(filter gpg,$(MOZ_EXTERNAL_SIGNING_FORMAT)))
# If we're signing with gpg, we'll have a bunch of extra detached signatures to
# upload. We also want to sign our checksums file
SIGN_CHECKSUM_CMD=$(MOZ_SIGN_CMD) -f gpg $(CHECKSUM_FILE)
@ -1003,7 +1002,6 @@ UPLOAD_FILES += $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR).asc))
UPLOAD_FILES += $(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE).asc)
UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE).asc)
endif
endif
checksum:
mkdir -p `dirname $(CHECKSUM_FILE)`

6
toolkit/mozapps/installer/signing.mk
View File

@ -9,7 +9,7 @@ ifndef MOZ_PROFILE_GENERATE
ifdef MOZ_SIGN_CMD
ifeq (WINNT,$(OS_ARCH))
MOZ_INTERNAL_SIGNING_FORMAT := signcode
MOZ_EXTERNAL_SIGNING_FORMAT := signcode gpg
MOZ_EXTERNAL_SIGNING_FORMAT := signcode
SIGN_INCLUDES := \
'*.dll' \
'*.exe' \
@ -24,11 +24,11 @@ endif # Windows
ifeq (Darwin, $(OS_ARCH))
MOZ_INTERNAL_SIGNING_FORMAT := dmg
MOZ_EXTERNAL_SIGNING_FORMAT := gpg
MOZ_EXTERNAL_SIGNING_FORMAT :=
endif # Darwin
ifeq (linux-gnu,$(TARGET_OS))
MOZ_EXTERNAL_SIGNING_FORMAT := gpg
MOZ_EXTERNAL_SIGNING_FORMAT :=
endif # Linux
endif # MOZ_SIGN_CMD