From patchwork Wed May 3 09:39:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23321 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB77FC7EE22 for ; Wed, 3 May 2023 09:39:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.14914.1683106787011597811 for ; Wed, 03 May 2023 02:39:47 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CB4B82F4; Wed, 3 May 2023 02:40:30 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 06F013F67D; Wed, 3 May 2023 02:39:45 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 1/2] dmidecode: upgrade to 3.5 Date: Wed, 3 May 2023 10:39:42 +0100 Message-Id: <20230503093943.2837374-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 03 May 2023 09:39:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/180801 This includes a fix for CVE-2023-30630. Remove the patch changing prefix and instead pass the paths to the make install command. Passing -e to make is no longer needed, the Makefile respects variables now. Signed-off-by: Ross Burton --- ...mitting-changes-from-do_unpack_extra.patch | 25 ------------------- .../{dmidecode_3.4.bb => dmidecode_3.5.bb} | 21 +++++++--------- 2 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch rename meta/recipes-devtools/dmidecode/{dmidecode_3.4.bb => dmidecode_3.5.bb} (50%) diff --git a/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch b/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch deleted file mode 100644 index d082459ca94..00000000000 --- a/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2c0437f47eaaf565aaccf0c0d150d5fc0fc734f5 Mon Sep 17 00:00:00 2001 -From: OpenEmbedded -Date: Thu, 22 Nov 2018 12:05:04 +0000 -Subject: [PATCH] Do not install to /usr/local - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7aa729d..e079b18 100644 ---- a/Makefile -+++ b/Makefile -@@ -31,7 +31,7 @@ CFLAGS += -D_FILE_OFFSET_BITS=64 - LDFLAGS ?= - - DESTDIR = --prefix = /usr/local -+prefix = /usr - sbindir = $(prefix)/sbin - mandir = $(prefix)/share/man - man8dir = $(mandir)/man8 diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.4.bb b/meta/recipes-devtools/dmidecode/dmidecode_3.5.bb similarity index 50% rename from meta/recipes-devtools/dmidecode/dmidecode_3.4.bb rename to meta/recipes-devtools/dmidecode/dmidecode_3.5.bb index bc741046dd0..3e2bb6e30bc 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode_3.4.bb +++ b/meta/recipes-devtools/dmidecode/dmidecode_3.5.bb @@ -4,21 +4,18 @@ DESCRIPTION = "Dmidecode reports information about your system's hardware as des LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz \ - file://0001-Committing-changes-from-do_unpack_extra.patch \ - " +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux" -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -# The upstream buildsystem uses 'docdir' as the path where it puts AUTHORS, -# README, etc, but we don't want those in the root of our docdir. -docdir .= "/${BPN}" - do_install() { - oe_runmake DESTDIR="${D}" install + oe_runmake \ + DESTDIR="${D}" \ + prefix="${prefix}" \ + sbindir="${sbindir}" \ + docdir="${docdir}/${BPN}" \ + mandir="${mandir}" \ + install } -SRC_URI[sha256sum] = "43cba851d8467c9979ccdbeab192eb6638c7d3a697eba5ddb779da8837542212" - +SRC_URI[sha256sum] = "79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073"