dmidecode: upgrade to 3.5

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.

(From OE-Core rev: 86f2f9cfdc23cc9a2579d968cb9bb0fc61608b62)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2023-04-24 14:03:54 +01:00
committed by Richard Purdie
parent 1285f78ce8
commit 4233caf60b
2 changed files with 9 additions and 37 deletions

View File

@@ -1,25 +0,0 @@
From 2c0437f47eaaf565aaccf0c0d150d5fc0fc734f5 Mon Sep 17 00:00:00 2001
From: OpenEmbedded <oe.patch@oe>
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 <alex.kanavin@gmail.com>
---
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

View File

@@ -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"