From patchwork Sun Sep 8 14:48:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3416 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 1E81B40D6D for ; Sun, 8 Sep 2024 16:48:23 +0200 (CEST) Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-535682ab6e9sf3165973e87.1 for ; Sun, 08 Sep 2024 07:48:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1725806902; cv=pass; d=google.com; s=arc-20240605; b=fKTewD/Xf6KKX3VwDLswMHl2RDn7A/i3FkBCPnNcouTd8+twV3ZxfZWrgThr5ptOZE K36xcMC8kUsh7BarpuLYCwZTGF8t97u/KtPVz2CPLBUXauoeQ/n50EFuE5Ry1RWqLxUq jVtzbGLrWmUi7SZH+2HEilYNcKpPt1JQB4/8+mS7gIwZj4B/HrnQQ2woeZJwccpEAKur 4mlSKUe/0+bQzkMeJCKhi9v6mAoTXCAO9Kzdzf+cnY8xpo8y6ZOaz3lJSTPFnvL08knM 7z/47SHHFZyoUJjiMklSdL7Y+GZpxNsFokzO3pKtjRRnwDpKTQrxc1x1j7UGtAuejjJX NARA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=YzcKtcum7cGHmiitvlSMZFf/FjmzNvwQ2j+FY7d9gqU=; fh=exZqGe8ct/jQb6X9bRNTYTIKibU4uPP7FDncR5oEuFM=; b=jJlTToZ9PxOj6Oox2GPyrNKfyC03wZU8vjJHdj1/unzsimg9Q0xjW3lASJhcPeJwBI Qub0XTbm9kErCEKed2kQ0yNUkweJLaamtOgxw9TwV6sNjoYNrD+DJlJoWiIqMNIn6zPL +dttWaSqotRyI5NHdwjx+Qut8Rnfl7IUP8GlNsRphLRDubIHVwLgYzS8ucT9O6MZGTH+ pPrlPxm3i2ARynOHxZrxZhbWGziDBgUSDyOeC4pG2NMA6nm8Apg2k4IDskxqLnZ3FVV4 zB4ooI9Lsy3J94Fxz7rl3klnXipx6o9YZ1w86Zir7L9uVCeQitC5PfPT3Iu/jHpQb1KK HDhQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FCcC86Hc; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1725806902; x=1726411702; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=YzcKtcum7cGHmiitvlSMZFf/FjmzNvwQ2j+FY7d9gqU=; b=UH5oe6K343hCdQrliuTAL1H1yOaBVfKGSiU81QVbvafAnQmunX9Ihnl21hKNXQswIX FvokIISWz3ZU64ipXnn5tWP1y3QT6GqJPVMLTCl+j0wroN0QrPD6+zphZ+54bUIA5xhH CKj6BTyxWU8Pfce37t7Iyxpzl7djoTtsfGDlo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725806902; x=1726411702; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YzcKtcum7cGHmiitvlSMZFf/FjmzNvwQ2j+FY7d9gqU=; b=UCplQy2YF3DSmTbbpYXkdgdiwOgdZuacGgeeofac6cBYRFm4Di42w58qHHWVWmp07e SGXCGhTZ9+he0/o4xVQu3Nm8H5TkNCVHA9kHkP/f++K/GmDMv54LiCVdhBxPDlUp7liK //pF0nz+FRfja16QajmqHUf0CzfUieXyVTfw4koKkwGGtYeJ2mQ4IDxsnk7AmrpU25Fh ExRnz+1z83DKilEGztxXqqhJ2uRFbrv7H9y8vJheMLIa7eLzaU99dZgNEg+S2IR1EF+d R8xOHXAUPg44+8VOQ/1EKtwxUg9a4euwnMCM/LWkbThGGdZBuW8C1FCwsZSjiVPgljfb Az7Q== X-Forwarded-Encrypted: i=2; AJvYcCXoZvVCILSoq76aS4IbzGcI7sgHJBmM7wnG5+aZDapPMeVKrVr4mJiP3nn1MqHAfTHPFQuymYqdeoe8PCvH@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwOUnpy0KFe2k6A2pJ6szSJ+BBJZJ4U9UbLxCQsJ3oEXiBM9PF6 8nw9MIKGdu35SPP5LwxsFTEq/+JvlgXxEis8T+qqprzvKaoool9Ya8QFdllKS4t+yQ== X-Google-Smtp-Source: AGHT+IHjnrcFzTuuupfZZOY25f59eI1Z2+RO580ISDJRnnv1y9GxsBXXJiZ6nOwstCaBJ3ugxl4ScQ== X-Received: by 2002:a05:6512:3d86:b0:52e:74f5:d13 with SMTP id 2adb3069b0e04-536587b3f46mr5235213e87.30.1725806902371; Sun, 08 Sep 2024 07:48:22 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:31cd:b0:533:484b:cc76 with SMTP id 2adb3069b0e04-536572fdf48ls1085841e87.0.-pod-prod-03-eu; Sun, 08 Sep 2024 07:48:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkGX/KmdGJeHANY280Zi0ktLJR5MVSaInrbOAYG6D1Z/YjChaACdShXtSCMnTELtSuMAphw5DXyWRfAqyD@amarulasolutions.com X-Received: by 2002:a05:6512:3983:b0:52c:86d7:fa62 with SMTP id 2adb3069b0e04-536587aa975mr6218972e87.23.1725806900627; Sun, 08 Sep 2024 07:48:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725806900; cv=none; d=google.com; s=arc-20160816; b=h5bRxSAUus3c5SXat6OnA2UID7jKl36heHvtBDDEkZ+p6aAEGInYi9w+KVL7rLWwNd vTKPhGaYikBZWeahn5a4VNcATtQvyZjOy6sZfyA9xLgqjK7JA5nFO0l3N/r8k8CK1/l2 Mi0YNZeTJDdH8hbFfe169tVtr5kVNXdeHUCyVNq52pDh9aUeOl/5vaXfZllAZeQ2B6HN MbL7JXBX74aKHkvwEdV4p8GHXwVZdeaJoligFw8e5URYaeUq+BxmHLiz2m4h715CtfVo qgLm2b9SOKbMjL21ZOkdpN6XQqICfVXvjmY5ax8pw3hPnvBtWjAS1SlsOexgzbcZqBh2 rCRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=cUbbb1kXWjjwyYgJbT9QmmJzLRqPEvZMt2LGUusZfNw=; fh=DmooJzWej9opC8BtysmBnnwlgrAHTxSraJqvfBsqcao=; b=pXLk3kt+mS38tQ8HUh3LM6uac32xsvMzAbt7sfgSeLITiGfw9gM6MweTFRq21W4M/d qGDHMhe5wBOSrOScrAWpZ9BnP6q9Hxm/p5OOEy/V9EhBBBJz+1QFSQhGUiy9kjqdl00e J4EVVWWA1d2806B6hqllWXn3KcLAoRPJPcVn2Ho+fI910GNCRIDzSGyZNI7UHpxHUb/1 ZFAKy/9mHsmleULhGiGZuSph6YFYylseG+On4kJTIH73ZxP9kOLWh8+PDivEDxzjcGmz FddXm7LXxxCbrM2SkX3G6tX8g536ylReZ7s+LfCFNX5S8SAR6zD4dK8FjiYsXsBwO6CD CRAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FCcC86Hc; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a8d25a07af1sor64122166b.12.2024.09.08.07.48.20 for (Google Transport Security); Sun, 08 Sep 2024 07:48:20 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXtMsLSXeX7+76ogcnjvCDNR3gNhqUPRb0ObZT2QPp1PqmKjvOI/FqUeZ+qN8JYeydO7bpHtOkAHiaPzTid@amarulasolutions.com X-Received: by 2002:a05:6402:3604:b0:5bf:c8:78a with SMTP id 4fb4d7f45d1cf-5c3dc795ce9mr5329399a12.17.1725806899863; Sun, 08 Sep 2024 07:48:19 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-87-4-102-18.retail.telecomitalia.it. [87.4.102.18]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd4693fsm1926602a12.37.2024.09.08.07.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2024 07:48:19 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Thomas Petazzoni , Heiko Thiery , Dario Binacchi , Floris Bos , linux-amarula@amarulasolutions.com, "Yann E . MORIN" Subject: [PATCH v4 2/2] package/ipmitool: use versioned or custom PEN registry Date: Sun, 8 Sep 2024 16:48:15 +0200 Message-ID: <20240908144815.3822467-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240908144815.3822467-1-dario.binacchi@amarulasolutions.com> References: <20240908144815.3822467-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FCcC86Hc; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The previous default URL used for the PEN registry was not stable and could change at any time, making it unacceptable to have to update its hash every time. With this patch, if the PEN (Enterprise numbers) registry is installed by the iana-assignments package, ipmitool will use it. Otherwise, the user can provide a custom file named enterprise-numbers to be placed under /usr/share/misc/ of the overlay rootfs. Downloading such a file is no longer supported. Fixes: - http://autobuild.buildroot.org/results/5ae5ee948d99679cd50d1115a7d46f4368347b4f Co-Developed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN Co-Developed-by: Thomas Petazzoni Signed-off-by: Thomas Petazzoni Signed-off-by: Dario Binacchi --- Changes v3 -> v4: - Drop BR2_PACKAGE_IPMITOOL_PEN_REG_URI and mark as a legacy option. - Drop IPMITOOL_DEPENDENCIES += iana-assignments. - Add IPMITOOL_CONF_ENV += IANADIR=/usr/share/misc in case of custom PEN. - Use IANA PEN registry in case BR2_PACKAGE_IANA_ASSIGNMENTS_PEN_REG is enabled. - Update the commit message. Changes v2 -> v3: - Use by default enterprise-numbers from iana-assignments package. - Alternatively allows to use a local PEN registry file. - Don't support URL path for PEN registry. Changes v1 -> v2: - use an enterprise-numbers file versioned Config.in.legacy | 12 ++++++++++++ package/ipmitool/Config.in | 18 ++++++------------ package/ipmitool/ipmitool.mk | 20 ++++++-------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7513aa7efd66..ece342bb12d9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -189,6 +189,18 @@ config BR2_BINUTILS_VERSION_2_40_X comment "Legacy options removed in 2024.08" +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI + string "IANA PEN registry move to iana-assignment package" + help + Installation of the IANA PEN is now handled by the + iana-assignment package; to install a custom PEN, + use a rootfs-overlay for example. + +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI_WRAP + bool + default y if BR2_PACKAGE_IPMITOOL_PEN_REG_URI != "" + select BR2_LEGACY + config BR2_PACKAGE_MIDORI bool "midori has been removed" select BR2_LEGACY diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index 9516ff8596d3..5cbcf8e535d4 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -5,22 +5,16 @@ config BR2_PACKAGE_IPMITOOL IPMItool provides a simple command-line interface to IPMI-enabled devices. + Note: If the PEN (Enterprise Numbers) registry is installed + by the "iana-assignments" package, ipmitool will use it. + Otherwise, the user can provide a custom file named + enterprise-numbers to be placed in the usr/share/misc/ + directory of the overlay rootfs. + https://github.com/ipmitool/ipmitool/ if BR2_PACKAGE_IPMITOOL -config BR2_PACKAGE_IPMITOOL_PEN_REG_URI - string "IANA PEN registry URL or path" - default "https://www.iana.org/assignments/enterprise-numbers.txt" - help - Enter an URL or a file path to the PEN registry to use. - - Note that the official registry is 4MiB+ and may change any - time and is thus not guaranteed to be reproducible. - - Leave empty to not use a registry; vendor IDs will be - displayed instead of the corresponding names. - config BR2_PACKAGE_IPMITOOL_LANPLUS bool "enable lanplus interface" select BR2_PACKAGE_OPENSSL diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 4f2151904d43..f2ae72bab841 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -49,20 +49,12 @@ endef IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_REMOVE_IPMIEVD endif -IPMITOOL_PEN_REG_URI = $(call qstrip,$(BR2_PACKAGE_IPMITOOL_PEN_REG_URI)) -ifneq ($(IPMITOOL_PEN_REG_URI),) -ifneq ($(findstring ://,$(IPMITOOL_PEN_REG_URI)),) -IPMITOOL_EXTRA_DOWNLOADS += $(IPMITOOL_PEN_REG_URI) -BR_NO_CHECK_HASH_FOR += $(notdir $(IPMITOOL_PEN_REG_URI)) -IPMITOOL_PEN_REG = $(IPMITOOL_DL_DIR)/$(notdir $(IPMITOOL_PEN_REG_URI)) +ifeq ($(BR2_PACKAGE_IANA_ASSIGNMENTS_PEN_REG),y) +IPMITOOL_CONF_ENV += IANADIR=/usr/share/misc/iana else -IPMITOOL_PEN_REG = $(IPMITOOL_PEN_REG_URI) -endif #findstring -define IPMITOOL_INSTALL_PEN_REG - $(INSTALL) -D -m 0644 $(IPMITOOL_PEN_REG) \ - $(TARGET_DIR)/usr/share/misc/enterprise-numbers -endef -IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_INSTALL_PEN_REG -endif # IPMITOOL_PEN_REG_URI !empty +# Directory where ipmitool will search a custom PEN +# registry provided by the user in the rootfs overlay. +IPMITOOL_CONF_ENV += IANADIR=/usr/share/misc +endif $(eval $(autotools-package))