From bdde940c05490d3128721e4f5eb67d456e7cc323 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 22 Nov 2018 16:41:24 +0100 Subject: dmidecode: update to 3.2 Also, replace a sed hack with a proper patch. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...1-Committing-changes-from-do_unpack_extra.patch | 24 +++++++++++++++++++ meta/recipes-devtools/dmidecode/dmidecode_3.1.bb | 27 ---------------------- meta/recipes-devtools/dmidecode/dmidecode_3.2.bb | 24 +++++++++++++++++++ 3 files changed, 48 insertions(+), 27 deletions(-) create mode 100644 meta/recipes-devtools/dmidecode/dmidecode/0001-Committing-changes-from-do_unpack_extra.patch delete mode 100644 meta/recipes-devtools/dmidecode/dmidecode_3.1.bb create mode 100644 meta/recipes-devtools/dmidecode/dmidecode_3.2.bb (limited to 'meta') 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 +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 +--- + 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.1.bb deleted file mode 100644 index b423fda6d2..0000000000 --- a/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "DMI (Desktop Management Interface) table related utilities" -HOMEPAGE = "http://www.nongnu.org/dmidecode/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -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 -} - -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" - diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.2.bb b/meta/recipes-devtools/dmidecode/dmidecode_3.2.bb new file mode 100644 index 0000000000..63f4061cb7 --- /dev/null +++ b/meta/recipes-devtools/dmidecode/dmidecode_3.2.bb @@ -0,0 +1,24 @@ +SUMMARY = "DMI (Desktop Management Interface) table related utilities" +HOMEPAGE = "http://www.nongnu.org/dmidecode/" +LICENSE = "GPLv2" +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 \ + " + +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 +} + +SRC_URI[md5sum] = "9cc2e27e74ade740a25b1aaf0412461b" +SRC_URI[sha256sum] = "077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd" + -- cgit 1.2.3-korg