summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch24
-rw-r--r--meta/recipes-devtools/dmidecode/dmidecode_3.2.bb (renamed from meta/recipes-devtools/dmidecode/dmidecode_3.1.bb)13
2 files changed, 29 insertions, 8 deletions
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
new file mode 100644
index 0000000000..c9b19182dd
--- /dev/null
+++ b/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch
@@ -0,0 +1,24 @@
1From 00a3ace35d66e7ae60046e254a4d00f0f9c1abe2 Mon Sep 17 00:00:00 2001
2From: OpenEmbedded <oe.patch@oe>
3Date: Thu, 22 Nov 2018 12:05:04 +0000
4Subject: [PATCH] Do not install to /usr/local
5
6Upstream-Status: Inappropriate
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 Makefile | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/Makefile b/Makefile
13index 77c9310..fc378fd 100644
14--- a/Makefile
15+++ b/Makefile
16@@ -30,7 +30,7 @@ CFLAGS += -O2
17 LDFLAGS =
18
19 DESTDIR =
20-prefix = /usr/local
21+prefix = /usr
22 sbindir = $(prefix)/sbin
23 mandir = $(prefix)/share/man
24 man8dir = $(mandir)/man8
diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb b/meta/recipes-devtools/dmidecode/dmidecode_3.2.bb
index b423fda6d2..63f4061cb7 100644
--- a/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
+++ b/meta/recipes-devtools/dmidecode/dmidecode_3.2.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "http://www.nongnu.org/dmidecode/"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 5
6SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz" 6SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz \
7 file://0001-Committing-changes-from-do_unpack_extra.patch \
8 "
7 9
8COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux" 10COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux"
9 11
@@ -17,11 +19,6 @@ do_install() {
17 oe_runmake DESTDIR="${D}" install 19 oe_runmake DESTDIR="${D}" install
18} 20}
19 21
20do_unpack_extra() { 22SRC_URI[md5sum] = "9cc2e27e74ade740a25b1aaf0412461b"
21 sed -i -e '/^prefix/s:/usr/local:${exec_prefix}:' ${S}/Makefile 23SRC_URI[sha256sum] = "077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd"
22}
23addtask unpack_extra after do_unpack before do_patch
24
25SRC_URI[md5sum] = "679c2c015c515aa6ca5f229aee49c102"
26SRC_URI[sha256sum] = "d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0"
27 24