package/sudo: cleanup the CPE_ID variables

The CPE variables are derived from the package upstream values, so they
must be set from the package values, not the other way around.

Also drop CPE_ID_VALID as it is implied as soon as at least one CPE
variable is set.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index 7f57c66b7534f5f12d78714977fc8c37ab7ecb4d..57c2292506e96f9299f5ce05641886a3a6832574 100644 (file)
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-SUDO_VERSION = $(SUDO_CPE_ID_VERSION)$(SUDO_CPE_ID_UPDATE)
+SUDO_VERSION_MAJOR = 1.9.5
+SUDO_VERSION_MINOR = p2
+SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR)
 SUDO_SITE = https://www.sudo.ws/sudo/dist
 SUDO_LICENSE = ISC, BSD-3-Clause
 SUDO_LICENSE_FILES = doc/LICENSE
-SUDO_CPE_ID_VALID = YES
-SUDO_CPE_ID_VERSION = 1.9.5
-SUDO_CPE_ID_UPDATE = p2
+SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR)
+SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR)
 # This is to avoid sudo's make install from chown()ing files which fails
 SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install
 SUDO_CONF_OPTS = \