From d0b208652f123eb0049aee20d88b66e0f86707ce Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 5 Mar 2021 23:27:43 +0100 Subject: [PATCH] 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 Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sudo/sudo.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 7f57c66b75..57c2292506 100644 --- 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 = \ -- 2.30.2