diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-05-25 14:15:42 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-05-25 14:15:42 +0200 |
| commit | beeb772e225ff5c325c726750ce32065eae5c680 (patch) | |
| tree | 513f0c20e93f5d6024d457913218cb7dc4f4717e | |
| parent | deae5fa9746971e723fc5aff926c8459753bb543 (diff) | |
| parent | dae432e0caf5474564d8a7bb8b093163bab9d469 (diff) | |
| download | rabbitmq-server-git-beeb772e225ff5c325c726750ce32065eae5c680.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | packaging/Makefile | 4 | ||||
| -rw-r--r-- | packaging/debs/apt-repository/Makefile | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/packaging/Makefile b/packaging/Makefile index da3dcccb60..31b85d9c1f 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -62,9 +62,7 @@ endif VARS = SOURCE_DIST_FILE="$(abspath $(SOURCE_DIST_FILE))" \ PACKAGES_DIR="$(abspath $(PACKAGES_DIR))" \ - SIGNING_KEY="$(SIGNING_KEY)" \ - SIGNING_USER_ID="$(SIGNING_USER_ID)" \ - SIGNING_USER_EMAIL="$(SIGNING_USER_EMAIL)" + SIGNING_KEY="$(SIGNING_KEY)" packages: package-deb package-rpm package-windows package-generic-unix @: diff --git a/packaging/debs/apt-repository/Makefile b/packaging/debs/apt-repository/Makefile index bbddc15a4e..dbf8871a51 100644 --- a/packaging/debs/apt-repository/Makefile +++ b/packaging/debs/apt-repository/Makefile @@ -1,7 +1,7 @@ PACKAGES_DIR ?= ../../../PACKAGES REPO_DIR ?= debian -SIGNING_USER_EMAIL ?= info@rabbitmq.com +SIGNING_KEY ?= default ifeq "$(UNOFFICIAL_RELEASE)" "" HOME_ARG = HOME=$(GNUPG_PATH) @@ -18,7 +18,7 @@ debian_apt_repository: clean mkdir -p $(REPO_DIR)/conf cp -a distributions $(REPO_DIR)/conf ifeq "$(UNOFFICIAL_RELEASE)" "" - echo SignWith: $(SIGNING_USER_EMAIL) >> $(REPO_DIR)/conf/distributions + echo SignWith: $(SIGNING_KEY) >> $(REPO_DIR)/conf/distributions endif for FILE in $(PACKAGES_DIR)/*.changes ; do \ $(HOME_ARG) reprepro --ignore=wrongdistribution \ |