NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnupg2: don't preserve the old gpg2 executable name

Browse Source 
Commit e82fadab23 (gnupg2: bump to version 2.2.0) added a configure
option to keep the old 'gpg2' executable name to avoid conflict with the
gnupg package. It turns out that gnupg depends on !BR2_PACKAGE_GNUPG2
since commit 2cadb26e6d (gnupg: make gnupg and gnupg2 mutually
exclusive). Drop this configure option.

Rename the config option that controls the removal of gpgv2, now gpgv,
to match the new name. Add legacy config symbol handling.

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Baruch Siach 2017-11-14 14:02:38 +02:00 committed by Thomas Petazzoni
parent 00012bf9d5
commit 86dfb429ae
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Config.in.legacy
View File

@ -142,6 +142,17 @@ comment "build, or run, in unpredictable ways. "
comment "----------------------------------------------------"
endif
###############################################################################
comment "Legacy options removed in 2018.02"
config BR2_PACKAGE_GNUPG2_GPGV2
bool "gnupg2 gpgv2 option removed"
select BR2_LEGACY
select BR2_PACKAGE_GNUPG2_GPGV
help
The gpgv2 executable is now named gpgv. The config option
has been renamed accordingly.
###############################################################################
comment "Legacy options removed in 2017.11"

6
package/gnupg2/Config.in
View File

@ -28,10 +28,10 @@ config BR2_PACKAGE_GNUPG2
if BR2_PACKAGE_GNUPG2
config BR2_PACKAGE_GNUPG2_GPGV2
bool "gpgv2"
config BR2_PACKAGE_GNUPG2_GPGV
bool "gpgv"
help
gpgv2 is an OpenPGP signature verification tool.
gpgv is an OpenPGP signature verification tool.
This program is actually a stripped-down version of gpg
which is only able to check signatures. It is somewhat

10
package/gnupg2/gnupg2.mk
View File

@ -12,9 +12,7 @@ GNUPG2_LICENSE_FILES = COPYING
GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
# Keep the gpg2 binary name to avoid conflict with gnupg
GNUPG2_CONF_OPTS = \
--enable-gpg-is-gpg2 \
--disable-rpath --disable-regex --disable-doc \
--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
@ -22,11 +20,11 @@ GNUPG2_CONF_OPTS = \
--with-ksba-prefix=$(STAGING_DIR)/usr \
--with-npth-prefix=$(STAGING_DIR)/usr
ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y)
define GNUPG2_REMOVE_GPGV2
rm -f $(TARGET_DIR)/usr/bin/gpgv2
ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y)
define GNUPG2_REMOVE_GPGV
rm -f $(TARGET_DIR)/usr/bin/gpgv
endef
GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV2
GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)