diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-22 16:41:24 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-22 16:15:10 +0000 |
| commit | bdde940c05490d3128721e4f5eb67d456e7cc323 (patch) | |
| tree | f229162849e81b23ac64eaf3152be4bdcffd656c | |
| parent | 03149ca307282c22dd9ceb6fe3224bf586b03f6d (diff) | |
| download | openembedded-core-bdde940c05490d3128721e4f5eb67d456e7cc323.tar.gz | |
dmidecode: update to 3.2
Also, replace a sed hack with a proper patch.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch | 24 | ||||
| -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 @@ +From 00a3ace35d66e7ae60046e254a4d00f0f9c1abe2 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 +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 77c9310..fc378fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,7 @@ CFLAGS += -O2 + 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.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/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz" +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz \ + file://0001-Committing-changes-from-do_unpack_extra.patch \ + " COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux" @@ -17,11 +19,6 @@ do_install() { oe_runmake DESTDIR="${D}" install } -do_unpack_extra() { - sed -i -e '/^prefix/s:/usr/local:${exec_prefix}:' ${S}/Makefile -} -addtask unpack_extra after do_unpack before do_patch - -SRC_URI[md5sum] = "679c2c015c515aa6ca5f229aee49c102" -SRC_URI[sha256sum] = "d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0" +SRC_URI[md5sum] = "9cc2e27e74ade740a25b1aaf0412461b" +SRC_URI[sha256sum] = "077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd" |