diff options
-rw-r--r-- | meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/dmidecode/dmidecode_3.5.bb (renamed from meta/recipes-devtools/dmidecode/dmidecode_3.4.bb) | 21 |
2 files changed, 9 insertions, 37 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 deleted file mode 100644 index d082459ca9..0000000000 --- a/meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 2c0437f47eaaf565aaccf0c0d150d5fc0fc734f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: OpenEmbedded <oe.patch@oe> | ||
3 | Date: Thu, 22 Nov 2018 12:05:04 +0000 | ||
4 | Subject: [PATCH] Do not install to /usr/local | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Makefile | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/Makefile b/Makefile | ||
14 | index 7aa729d..e079b18 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -31,7 +31,7 @@ CFLAGS += -D_FILE_OFFSET_BITS=64 | ||
18 | LDFLAGS ?= | ||
19 | |||
20 | DESTDIR = | ||
21 | -prefix = /usr/local | ||
22 | +prefix = /usr | ||
23 | sbindir = $(prefix)/sbin | ||
24 | mandir = $(prefix)/share/man | ||
25 | man8dir = $(mandir)/man8 | ||
diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.4.bb b/meta/recipes-devtools/dmidecode/dmidecode_3.5.bb index bc741046dd..3e2bb6e30b 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 | |||
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
6 | 6 | ||
7 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz \ | 7 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz" |
8 | file://0001-Committing-changes-from-do_unpack_extra.patch \ | ||
9 | " | ||
10 | 8 | ||
11 | COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux" | 9 | COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc|powerpc64).*-linux" |
12 | 10 | ||
13 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | ||
14 | |||
15 | # The upstream buildsystem uses 'docdir' as the path where it puts AUTHORS, | ||
16 | # README, etc, but we don't want those in the root of our docdir. | ||
17 | docdir .= "/${BPN}" | ||
18 | |||
19 | do_install() { | 11 | do_install() { |
20 | oe_runmake DESTDIR="${D}" install | 12 | oe_runmake \ |
13 | DESTDIR="${D}" \ | ||
14 | prefix="${prefix}" \ | ||
15 | sbindir="${sbindir}" \ | ||
16 | docdir="${docdir}/${BPN}" \ | ||
17 | mandir="${mandir}" \ | ||
18 | install | ||
21 | } | 19 | } |
22 | 20 | ||
23 | SRC_URI[sha256sum] = "43cba851d8467c9979ccdbeab192eb6638c7d3a697eba5ddb779da8837542212" | 21 | SRC_URI[sha256sum] = "79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073" |
24 | |||