From 5559ea533dd2ee5a6d5f10ec8cb2b244ce7f9e65 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Wed, 5 Sep 2018 20:48:47 -0700 Subject: cpuid: upgrade 20170122 -> 20180519 - Remove upstreamed patch - Create directory and install file in single install operation Signed-off-by: Tim Orling Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb | 23 --------------------- meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb | 21 +++++++++++++++++++ ...ix-Add-sys-sysmacros.h-to-fix-build-issue.patch | 24 ---------------------- 3 files changed, 21 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb create mode 100644 meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb delete mode 100644 meta-oe/recipes-devtools/cpuid/files/0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb deleted file mode 100644 index 5dd1bdd4ee..0000000000 --- a/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Linux tool to dump x86 CPUID information about the CPU(s)" -DESCRIPTION = "cpuid dumps detailed information about the CPU(s) gathered \ -from the CPUID instruction, and also determines the exact model of CPU(s). \ -It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \ -UMC, NexGen, Rise, and SiS CPUs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ - file://0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch" -SRC_URI[md5sum] = "1c46a6662626c5a6eaca626f23a5a7d7" -SRC_URI[sha256sum] = "667612aae6704341dd10844e97c84c5c5c8700817a5937a3c293b55013bc4865" - -COMPATIBLE_HOST = "(i.86|x86_64).*-linux" - -# The install rule from the Makefile has hardcoded paths, so we duplicate -# the actions to accommodate different paths. -do_install () { - install -d -m755 ${D}/${bindir} - install -m755 ${B}/cpuid ${D}/${bindir}/cpuid - install -d -m755 ${D}/${mandir} - install -m444 ${B}/cpuid.man.gz ${D}/${mandir} -} diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb new file mode 100644 index 0000000000..533a00026e --- /dev/null +++ b/meta-oe/recipes-devtools/cpuid/cpuid_20180519.bb @@ -0,0 +1,21 @@ +SUMMARY = "Linux tool to dump x86 CPUID information about the CPU(s)" +DESCRIPTION = "cpuid dumps detailed information about the CPU(s) gathered \ +from the CPUID instruction, and also determines the exact model of CPU(s). \ +It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \ +UMC, NexGen, Rise, and SiS CPUs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ + " +SRC_URI[md5sum] = "b3b4e44ef49575043a91def0207dcc76" +SRC_URI[sha256sum] = "967823be36f23cbc972eb0aa882d069c1d155a5978990ac3bcf425e6a2e7ff9a" + +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" + +# The install rule from the Makefile has hardcoded paths, so we duplicate +# the actions to accommodate different paths. +do_install () { + install -D -m 0755 ${B}/cpuid ${D}/${bindir}/cpuid + install -D -m 0444 ${B}/cpuid.man.gz ${D}/${mandir} +} diff --git a/meta-oe/recipes-devtools/cpuid/files/0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch b/meta-oe/recipes-devtools/cpuid/files/0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch deleted file mode 100644 index 985182e3bd..0000000000 --- a/meta-oe/recipes-devtools/cpuid/files/0001-Fix-Add-sys-sysmacros.h-to-fix-build-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2693a499d4eec4504962e85a9713fa6431d3025f Mon Sep 17 00:00:00 2001 -From: Avinash Reddy Palleti -Date: Thu, 16 Aug 2018 22:36:31 +0530 -Subject: [PATCH] Fix: Add sys/sysmacros.h to fix build issue - ---- - cpuid.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cpuid.c b/cpuid.c -index 3c94837..0a98616 100644 ---- a/cpuid.c -+++ b/cpuid.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.7.4 - -- cgit 1.2.3-korg