use /etc/apt/trusted.gpg.d/ mechanism to install trusted apt keys

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 1cd5ba19c0b18ce57bdc5381ba14ca6af98abc47..38df2ebb56baf9700a89180fd6c8deb5078f4a68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,13 +89,18 @@ LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb
 
 DEBS=${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
 
+PVE_RELEASE_KEYS=                              \
+       proxmox-ve/proxmox-release-4.x.pubkey   \
+       proxmox-ve/proxmox-release-5.x.pubkey
+
 all: check_gcc ${DEBS}
 
-${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
+${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
        rm -rf proxmox-ve/data
        mkdir -p proxmox-ve/data/DEBIAN
        mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/
-       install -m 0644 proxmox-ve/proxmox-release\@proxmox.com.pubkey proxmox-ve/data/usr/share/doc/${PVEPKG}
+       mkdir -p proxmox-ve/data/etc/apt/trusted.gpg.d
+       gpg2 --no-default-keyring --keyring ./proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve.gpg --import ${PVE_RELEASE_KEYS}
        sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/control >proxmox-ve/data/DEBIAN/control
        sed -e 's/@KVNAME@/${KVNAME}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
        chmod 0755 proxmox-ve/data/DEBIAN/postinst