cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/x86info: pick up latest sources.

Browse Source 
Integrates 2 of our patches

Take MAINTAINER.
This commit is contained in:
Larry Rosenman 2018-09-15 22:57:53 +00:00
parent a4cfa2af12
commit 3d06daf30b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=479847
4 changed files with 6 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/x86info/Makefile
View File

@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= x86info
DISTVERSION= 1.31snap02
DISTVERSION= 1.31snap03
CATEGORIES= sysutils
MAINTAINER= ports@FreeBSD.org
MAINTAINER= ler@FreeBSD.org
COMMENT= x86 CPU identification and feature display utility
LICENSE= GPLv2
@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_GITHUB= yes
GH_ACCOUNT= kernelslacker
GH_TAGNAME= b7d0839
GH_TAGNAME= 1b41e8b
USES= gmake pkgconfig python:build

6
sysutils/x86info/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1515691206
SHA256 (kernelslacker-x86info-1.31snap02-b7d0839_GH0.tar.gz) = eda506bac6352ac3f0a2de26601fe98a399f055d52c65298a47e12ce5ef64677
SIZE (kernelslacker-x86info-1.31snap02-b7d0839_GH0.tar.gz) = 85805
TIMESTAMP = 1537051964
SHA256 (kernelslacker-x86info-1.31snap03-1b41e8b_GH0.tar.gz) = a3fd00224315a07b9cc2009ea87d1c3f627795b818608149c1f257669ee441c9
SIZE (kernelslacker-x86info-1.31snap03-1b41e8b_GH0.tar.gz) = 85780

18
sysutils/x86info/files/patch-cpuid.c
View File

@ -1,18 +0,0 @@
--- cpuid.c.orig 2017-09-06 10:17:13.000000000 -0600
+++ cpuid.c 2018-01-11 10:34:12.018249000 -0700
@@ -21,14 +21,7 @@
{
unsigned int a = 0, b = 0, c = 0, d = 0;
- if (eax != NULL)
- a = *eax;
- if (ebx != NULL)
- b = *ebx;
- if (ecx != NULL)
- c = *ecx;
- if (edx != NULL)
- d = *edx;
+ c = idx >> 32;
bind_cpu(cpunr);

25
sysutils/x86info/files/patch-cpuid_freebsd.c
View File

@ -1,25 +0,0 @@
--- cpuid-freebsd.c.orig 2017-09-06 10:17:13.000000000 -0600
+++ cpuid-freebsd.c 2018-01-11 10:34:01.353720000 -0700
@@ -39,7 +39,7 @@
static int nodriver=0;
char cpuname[20];
int fh;
- cpuctl_cpuid_args_t args;
+ cpuctl_cpuid_count_args_t args;
if (nodriver == 1) {
if (native_cpuid(CPU_number, idx, eax,ebx,ecx,edx))
@@ -48,11 +48,12 @@
}
args.level = idx;
+ args.level_type = idx >> 32;
/* Ok, use the /dev/CPU interface in preference to the _up code. */
(void)snprintf(cpuname, sizeof(cpuname), "/dev/cpuctl%u", CPU_number);
fh = open(cpuname, O_RDONLY);
if (fh != -1) {
- if (ioctl(fh, CPUCTL_CPUID, &args) != 0) {
+ if (ioctl(fh, CPUCTL_CPUID_COUNT, &args) != 0) {
perror(cpuname);
exit(EXIT_FAILURE);
}