diff options
| author | Jin-Jie Huang <nia1048596@gmail.com> | 2015-02-05 13:58:58 +0800 |
|---|---|---|
| committer | Jin-Jie Huang <nia1048596@gmail.com> | 2015-02-05 13:58:58 +0800 |
| commit | 17a9287f7953883348a8da0a784002e3fec52e4c (patch) | |
| tree | 27e78aae1e7174d3a124ebbb1eaafc021a89a0dd | |
| parent | cfaff762363ad76f95fb6a4b55d0df9fc5427615 (diff) | |
| download | wspkg-17a9287f7953883348a8da0a784002e3fec52e4c.tar wspkg-17a9287f7953883348a8da0a784002e3fec52e4c.tar.gz wspkg-17a9287f7953883348a8da0a784002e3fec52e4c.tar.bz2 wspkg-17a9287f7953883348a8da0a784002e3fec52e4c.tar.lz wspkg-17a9287f7953883348a8da0a784002e3fec52e4c.tar.xz wspkg-17a9287f7953883348a8da0a784002e3fec52e4c.tar.zst wspkg-17a9287f7953883348a8da0a784002e3fec52e4c.zip | |
debian: 增加 package signature
| -rw-r--r-- | debian/debian-defaults.mk | 3 | ||||
| -rw-r--r-- | debian/debian.mk | 25 | ||||
| -rw-r--r-- | wspkg-mk/silent.mk | 4 |
3 files changed, 30 insertions, 2 deletions
diff --git a/debian/debian-defaults.mk b/debian/debian-defaults.mk index 648e285..bb20143 100644 --- a/debian/debian-defaults.mk +++ b/debian/debian-defaults.mk @@ -9,3 +9,6 @@ DEBIAN_OUT_PKG= $(OUTDIR)/$(PKGNAME).deb # Repository DEBIAN_OUT_REPO= $(OUTDIR)/repo + +# Signature +DEBIAN_SIGN= no diff --git a/debian/debian.mk b/debian/debian.mk index 73afff5..3902a03 100644 --- a/debian/debian.mk +++ b/debian/debian.mk @@ -1,6 +1,10 @@ # vim: set ts=8 sts=8 sw=8 ft=make: # Create .deb meta-package for Debian +DEBIAN_INSTALL= $(DEBIAN_INSTALL_$(DEBIAN_SIGN)) +DEBIAN_INSTALL_yes= debian-install-repo debian-install-sign +DEBIAN_INSTALL_no= debian-install-repo + debian: $(DEBIAN_OUT_PKG) # debian.control.in + debian.list --(debian.control.sh)-> debian.control @@ -26,11 +30,24 @@ $(DEBIAN_OUT_PKG): $(DEBIAN_OUT_CONTROL) $(AT_GEN)dpkg-deb --build \ $(DEBIAN_OUT_PKGDIR) $(DEBIAN_OUT_PKG) -debian-install: $(DEBIAN_OUT_PKG) +debian-install-repo: $(DEBIAN_OUT_PKG) $(AT_MKDIR)mkdir -p $(DEBIAN_OUT_REPO) $(AT_COPY)cp -pf $(DEBIAN_OUT_PKG) $(DEBIAN_OUT_REPO) $(AT_GEN)cd $(DEBIAN_OUT_REPO) && dpkg-scanpackages . > Packages - $(AT_GEN)gzip -9f $(DEBIAN_OUT_REPO)/Packages + $(AT_GEN)gzip -9c $(DEBIAN_OUT_REPO)/Packages \ + > $(DEBIAN_OUT_REPO)/Packages.gz + +debian-install-sign: + $(AT_SIGN)dpkg-sig -k $(DEBIAN_KEY_PKGSIGN) -s origin $(DEBIAN_OUT_PKG) + $(AT_GEN)cd $(DEBIAN_OUT_REPO) && apt-ftparchive release . > Release + $(AT_GEN)cd $(DEBIAN_OUT_REPO) && rm -f InRelease Release.gpg + $(AT_SIGN)cd $(DEBIAN_OUT_REPO) && gpg \ + --default-key $(DEBIAN_KEY_PKGSIGN) \ + --clearsign -o InRelease Release + $(AT_SIGN)cd $(DEBIAN_OUT_REPO) && gpg \ + --default-key $(DEBIAN_KEY_PKGSIGN) -abs -o Release.gpg Release + +debian-install: $(DEBIAN_INSTALL) debian-show: @echo "-- Control file" @@ -43,3 +60,7 @@ debian-show: @echo "" @echo "-- Repository" @echo "O: DEBIAN_OUT_REPO = $(DEBIAN_OUT_REPO)" + @echo "" + @echo "-- Signature" + @echo "V: DEBIAN_SIGN = $(DEBIAN_SIGN)" + @echo "V: DEBIAN_KEY_PKGSIGN = $(DEBIAN_KEY_PKGSIGN)" diff --git a/wspkg-mk/silent.mk b/wspkg-mk/silent.mk index 6f504c8..a85c4a8 100644 --- a/wspkg-mk/silent.mk +++ b/wspkg-mk/silent.mk @@ -27,3 +27,7 @@ AT_COPY_1= AT_MKDIR=$(AT_MKDIR_$(V)) AT_MKDIR_0=@echo " MKDIR "$@; AT_MKDIR_1= + +AT_SIGN=$(AT_SIGN_$(V)) +AT_SIGN_0=@echo " SIGN "$@; +AT_SIGN_1= |