summaryrefslogtreecommitdiff
path: root/sys-apps/cpuid
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/cpuid')
-rw-r--r--sys-apps/cpuid/Manifest8
-rw-r--r--sys-apps/cpuid/cpuid-20170122.ebuild33
-rw-r--r--sys-apps/cpuid/cpuid-20180519.ebuild36
-rw-r--r--sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch10
-rw-r--r--sys-apps/cpuid/files/cpuid-20180519-makefile.patch46
-rw-r--r--sys-apps/cpuid/metadata.xml13
6 files changed, 110 insertions, 36 deletions
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index da2b65981410..79b97802b9fe 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,7 +1,9 @@
AUX cpuid-20170122-Makefile.patch 1379 BLAKE2B 4a21e4dc20c71e81cd347daa4afd21599d35d70c2ff527b59fdf531909a2f80a9b953ab67f97537c486db18072265bf8d41eb7958d92a99c401bd003764e76f1 SHA512 b69b9913e56c20a117ae13fcb2ee5aed0b4379d40209f8046477c5b2abb247cdfc18d9cd048e0000aa145b4920f3eeacdfca534e80822294287119b04178a8c7
AUX cpuid-20170122-missing-include-sysmacros.patch 255 BLAKE2B 7b7e2a80638627d78be8738eee9b8ef301d45ade835421f801ceca1c0752cd3199d3fff13053ef2ddac697fd729c9d6f703589f434e8eccf367df3d6684da8b4 SHA512 4d87f27a3b7742bf1ed0cb3556ae4da83f8c891858ab2facf1b17dcf2bca65e6b53bcab099196d9a0cd13d65b0de7bb1c1bd7559b260e1ac29da209998a0ba26
-DIST cpuid-20170122.src.tar.gz 80046 BLAKE2B 4c6c6719f57b446c92c5636a35aac883497d457719c67acb61db75ce99c46edee368d63e790b6b21ea334293aaed221374229e334cefcc65ea8b05c8ae40d172 SHA512 0e057980c71a0e078254e6b7535747bdf368278932c39943cf7dfafe08443af07297a2b41518499937a710fe6950ba89377cabaada5f6332932650d4d17c1430
+AUX cpuid-20180519-add-spec-ctrl-output.patch 516 BLAKE2B f6c3a5c42afe5a97fd3712a9168b3d883614919a3e00c0bb671275b5227b9a4aebb8185fc27ccdfc3588db412a1234b0962987deb559c70a24afae580d04c49a SHA512 0e14946bf58eb009b65a8b849353b3940f8a13cb0a8ee1d53006b1e36e846785bad1bdeaab35e56b26faf08f5b8d81cf279cbc0de88fc5f13cb8471e8554c96a
+AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d90767416414ef07e818892e4c552741bb0001b040c2e6ccdbb470fc7eefaa5f428f611d9d8feb03675d91ec603c6794e0262b5 SHA512 272391a70c4b6b31769f6ae4c4c39b942fd0fc7130729c93abd977a5d82f655e3e7513747fdf4abb238bd1ddebb11eb7925e8ebbed393a0704ad9bbef52b6da4
DIST cpuid-20180419.src.tar.gz 82301 BLAKE2B 6905c0946fb9a930c67718067923c8c238031539c95704664160efde8563b0f56aadf3132abc9833310846802f97330edff833b47c006a4f46fec49358b56e31 SHA512 c8e30e45df7be5bdbff7e449b447b4542326a112f563c114c67cc80764070f3f3815ff4f80ceb57360828061bc9fd5f2f24f8e53ae4db47781f36db32141c951
-EBUILD cpuid-20170122.ebuild 653 BLAKE2B d14107fb1832a04a45316be73c175f56e0e2baebdf3c29e3492e3a688cc2b69d4614303eb6ff8a4f2f0c485c45a9e6a6288900d34b11d641a9d4359cf0b83855 SHA512 a39dd97b2030131a9a69e846f542558d0c9f304527b66860ca57b29ca625ce15c4ee2d205de7d66918eae069a5e326f396e36dab7b26273bb6847e52df8e6dd4
+DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
EBUILD cpuid-20180419.ebuild 652 BLAKE2B 8d13819ec16878fe33fe6398349e72b0e81296128e29bd966a105ca42c835acd7f5f4507379ddd3489186b33daefe3e45c9668ad1a3bd21261ad77587122a655 SHA512 1c69a30c3500d95a1930017b20c6ba3c2b8aeb63d09d75ddf0c0c136b241a27bbcc546544758a0e9b4d079eaf34232a493949ef01713d68182f2d0333dae2db9
-MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
+EBUILD cpuid-20180519.ebuild 642 BLAKE2B 76ca6e052ce0424e38a8c8e6c89ee125f8ef1535e65099d804154a35a6daa251d369dcec7c0b655ae29d7df65df0142533ad255af5ad411ec5b731ad422d50ad SHA512 882e91d630d6d2f054c9b31b93f95011b9463aa416f3946b51b42ff5222ba57e17c24b789bae6e914262a77055b7b4f179f5b2603d67eb8294555ffb7c690325
+MISC metadata.xml 756 BLAKE2B 7065a1bff2440d5e5380d5a57a65901a1ead05016faef52e3f9999c91976c57f994dc4add3e3d46193337bce134732bc33b21b12a7ea69055bb3a8ae654571bc SHA512 0e8a9c2a2ce2c6647b22f71761d2c64a5aa722d59d83b2c34210b7b5913c491ed91f99941095e8a05a326f39eba71a61729d914388348e5dd0637ba9e2c856cc
diff --git a/sys-apps/cpuid/cpuid-20170122.ebuild b/sys-apps/cpuid/cpuid-20170122.ebuild
deleted file mode 100644
index 5bd738081d41..000000000000
--- a/sys-apps/cpuid/cpuid-20170122.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to get detailed information about the CPU(s) using the CPUID instruction"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- app-arch/gzip
- dev-lang/perl"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20170122-Makefile.patch
- "${FILESDIR}"/${PN}-20170122-missing-include-sysmacros.patch
-)
-
-src_configure() {
- tc-export CC
-}
-
-src_install() {
- emake BUILDROOT="${ED}" install
- einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20180519.ebuild b/sys-apps/cpuid/cpuid-20180519.ebuild
new file mode 100644
index 000000000000..045dbac2f81e
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20180519.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-lang/perl"
+DEPEND="app-arch/gzip"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=(
+ "${FILESDIR}/${P}-add-spec-ctrl-output.patch"
+ "${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+ default
+
+ tc-export CC
+}
+
+src_install() {
+ emake BUILDROOT="${ED}" install
+
+ einstalldocs
+}
diff --git a/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch b/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch
new file mode 100644
index 000000000000..7cb078fe7eca
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch
@@ -0,0 +1,10 @@
+--- a/cpuid.c 2018-05-19 14:09:29.000000000 +0200
++++ b/cpuid.c 2019-08-08 21:53:03.000000000 +0200
+@@ -4249,6 +4249,7 @@
+ { "fast short REP MOV" , 4, 4, bools },
+ { "PCONFIG" , 18, 18, bools },
+ { "CET_IBT: CET indirect branch tracking" , 20, 20, bools },
++ { "SPEC_CTRL: Speculation Control" , 26, 26, bools },
+ };
+ print_names(value, names, LENGTH(names, named_item),
+ /* max_len => */ 40);
diff --git a/sys-apps/cpuid/files/cpuid-20180519-makefile.patch b/sys-apps/cpuid/files/cpuid-20180519-makefile.patch
new file mode 100644
index 000000000000..e140c322fb19
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20180519-makefile.patch
@@ -0,0 +1,46 @@
+--- a/Makefile 2018-05-19 14:15:37.000000000 +0200
++++ b/Makefile 2019-08-08 21:43:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-CFLAGS+=-g
++CFLAGS+=
+ CPPFLAGS?=
+ LDFLAGS?=
+ ifneq (,$(findstring arch=i386,$(CFLAGS)))
+@@ -36,7 +36,7 @@
+
+ BUILDROOT=
+
+-default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
++default: $(PROG) cpuinfo2cpuid cpuinfo2cpuid.man
+
+ $(PROG): cpuid.c Makefile
+ $(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
+@@ -50,11 +50,11 @@
+ cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
+ gzip < $< > $@
+
+-install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
+- install -D -s -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
+- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
++install: $(PROG) cpuinfo2cpuid
++ install -D -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
++ install -D -m 444 $(PROG).man $(BUILDROOT)/usr/share/man/man1/$(PROG).1
+ install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid
+- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
++ install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1
+
+ clean:
+ rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
+@@ -71,10 +71,10 @@
+ # Todd's Development rules
+
+ $(PROG).i386: cpuid.c Makefile
+- $(CC) -m32 -Wl,--hash-style=both $(CFL) $(LDFLAGS) -o $@ cpuid.c
++ $(CC) -m32 $(CFL) -o $@ cpuid.c
+
+ $(PROG).x86_64: cpuid.c Makefile
+- $(CC) -m64 $(CFL) $(LDFLAGS) -o $@ cpuid.c
++ $(CC) -m64 $(CFL) -o $@ cpuid.c
+
+ todd: $(PROG).i386 $(PROG).x86_64
+ rm -f ~/.bin/execs/i586/$(PROG)
diff --git a/sys-apps/cpuid/metadata.xml b/sys-apps/cpuid/metadata.xml
index 15fd2f3a22be..2cd77ae0f5fc 100644
--- a/sys-apps/cpuid/metadata.xml
+++ b/sys-apps/cpuid/metadata.xml
@@ -5,4 +5,17 @@
<email>johu@gentoo.org</email>
<name>Johannes Huber</name>
</maintainer>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ CPUID dumps detailed information about the CPUs gathered from the CPUID instruction,
+ and also determines the exact model of CPUs. It supports Intel, AMD, and VIA CPUs,
+ as well as older Transmeta, Cyrix, UMC, NexGen, Rise, and SiS CPUs.
+ </longdescription>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 21:59:49 +0000