From cb480a40b23b1eb98e839098d957478f71b1ce84 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 20 Oct 2020 15:11:08 +0100 Subject: [PATCH] gnupg: prepare for gnupg2 Use ALTERNATIVES for /usr/bin/gpg and /usr/bin/gpgv, so upcoming gnupg2 variants can be selected instead. Signed-off-by: Daniel Golle --- utils/gnupg/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile index 755ee3bbc..f362643e1 100644 --- a/utils/gnupg/Makefile +++ b/utils/gnupg/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnupg PKG_VERSION:=1.4.23 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/gnupg @@ -35,11 +35,13 @@ endef define Package/gnupg $(call Package/gnupg/Default) MENU:=1 + ALTERNATIVES:=200:/usr/bin/gpg:/usr/bin/gpg1 endef define Package/gpgv $(call Package/gnupg/Default) TITLE:=GnuPG signature verification only + ALTERNATIVES:=200:/usr/bin/gpgv:/usr/bin/gpgv1 endef 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 $(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 define Package/gpgv/install $(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 define Package/gnupg-utils/install