Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnupg: prepare for gnupg2

Browse source 
Use ALTERNATIVES for /usr/bin/gpg and /usr/bin/gpgv, so upcoming gnupg2
variants can be selected instead.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-10-20 15:11:08 +01:00 committed by Daniel Golle
parent e24e8fa98c
commit cb480a40b2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
utils/gnupg/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gnupg PKG_NAME:=gnupg
PKG_VERSION:=1.4.23 PKG_VERSION:=1.4.23
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/gnupg PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/gnupg
@ -35,11 +35,13 @@ endef
define Package/gnupg define Package/gnupg
$(call Package/gnupg/Default) $(call Package/gnupg/Default)
MENU:=1 MENU:=1
ALTERNATIVES:=200:/usr/bin/gpg:/usr/bin/gpg1
endef endef
define Package/gpgv define Package/gpgv
$(call Package/gnupg/Default) $(call Package/gnupg/Default)
TITLE:=GnuPG signature verification only TITLE:=GnuPG signature verification only
ALTERNATIVES:=200:/usr/bin/gpgv:/usr/bin/gpgv1
endef endef
define Package/gnupg-utils define Package/gnupg-utils
@ -89,12 +91,12 @@ TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-DEXTERN_UNLESS_MAIN_MODULE=s
define Package/gnupg/install define Package/gnupg/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpg $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpg $(1)/usr/bin/gpg1
endef endef
define Package/gpgv/install define Package/gpgv/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpgv $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpgv $(1)/usr/bin/gpgv1
endef endef
define Package/gnupg-utils/install define Package/gnupg-utils/install