From 3ce5372277f4657ad0e52d36c979527c4ca22de2 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Sat, 4 Apr 2020 21:20:18 -0700 Subject: 12830 Want centralized ksensor framework 12831 temperature sensors could describe accuracy 12832 topo support for generic PCI device temp sensors Reviewed by: Ryan Zezeski Reviewed by: Toomas Soome Approved by: Dan McDonald --- usr/src/pkg/manifests/driver-cpu-sensor.mf | 7 +----- usr/src/pkg/manifests/system-ksensor.mf | 36 +++++++++++++++++++++++++++++ usr/src/pkg/manifests/system-test-ostest.mf | 15 ++++++++++++ 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 usr/src/pkg/manifests/system-ksensor.mf (limited to 'usr/src/pkg') diff --git a/usr/src/pkg/manifests/driver-cpu-sensor.mf b/usr/src/pkg/manifests/driver-cpu-sensor.mf index 4deea9570f..7f8dc9372a 100644 --- a/usr/src/pkg/manifests/driver-cpu-sensor.mf +++ b/usr/src/pkg/manifests/driver-cpu-sensor.mf @@ -23,10 +23,6 @@ set name=variant.arch value=i386 dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys -dir path=usr/include -dir path=usr/include/sys -dir path=usr/lib/devfsadm group=sys -dir path=usr/lib/devfsadm/linkmod group=sys dir path=usr/share/man dir path=usr/share/man/man7d driver name=amdf17nbdf \ @@ -63,10 +59,9 @@ file path=kernel/drv/$(ARCH64)/amdnbtemp group=sys file path=kernel/drv/$(ARCH64)/coretemp group=sys file path=kernel/drv/$(ARCH64)/pchtemp group=sys file path=kernel/drv/coretemp.conf group=sys -file path=usr/include/sys/sensors.h mode=0644 -file path=usr/lib/devfsadm/linkmod/SUNW_sensor_link.so group=sys file path=usr/share/man/man7d/amdf17nbdf.7d file path=usr/share/man/man7d/amdnbtemp.7d file path=usr/share/man/man7d/coretemp.7d file path=usr/share/man/man7d/pchtemp.7d license lic_CDDL license=lic_CDDL +depend fmri=system/ksensor type=require diff --git a/usr/src/pkg/manifests/system-ksensor.mf b/usr/src/pkg/manifests/system-ksensor.mf new file mode 100644 index 0000000000..ae5adf31df --- /dev/null +++ b/usr/src/pkg/manifests/system-ksensor.mf @@ -0,0 +1,36 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2020 Oxide Computer Company +# + + +set name=pkg.fmri value=pkg:/system/ksensor@$(PKGVERS) +set name=pkg.description value="Kernel Sensor Framework" +set name=pkg.summary value="Kernel Sensor Framework" +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=usr/include +dir path=usr/include/sys +dir path=usr/lib/devfsadm group=sys +dir path=usr/lib/devfsadm/linkmod group=sys +dir path=usr/share/man +dir path=usr/share/man/man7d +driver name=ksensor +file path=kernel/drv/$(ARCH64)/ksensor group=sys +file path=kernel/drv/ksensor.conf group=sys +file path=usr/include/sys/sensors.h mode=0644 +file path=usr/lib/devfsadm/linkmod/SUNW_sensor_link.so group=sys +file path=usr/share/man/man7d/ksensor.7d +license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.mf index 106e99c690..c3e2ff15e7 100644 --- a/usr/src/pkg/manifests/system-test-ostest.mf +++ b/usr/src/pkg/manifests/system-test-ostest.mf @@ -22,6 +22,8 @@ set name=pkg.summary value="OS Unit Test Suite" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys dir path=opt/os-tests dir path=opt/os-tests/bin dir path=opt/os-tests/runfiles @@ -29,6 +31,7 @@ dir path=opt/os-tests/tests dir path=opt/os-tests/tests/ddi_ufm dir path=opt/os-tests/tests/file-locking $(i386_ONLY)dir path=opt/os-tests/tests/i386 +dir path=opt/os-tests/tests/ksensor dir path=opt/os-tests/tests/libtopo dir path=opt/os-tests/tests/pf_key dir path=opt/os-tests/tests/sdevfs @@ -38,6 +41,8 @@ dir path=opt/os-tests/tests/sockfs dir path=opt/os-tests/tests/stress dir path=opt/os-tests/tests/timer dir path=opt/os-tests/tests/uccid +file path=kernel/drv/$(ARCH64)/ksensor_test group=sys +file path=kernel/drv/ksensor_test.conf group=sys file path=opt/os-tests/README mode=0444 file path=opt/os-tests/bin/ostest mode=0555 file path=opt/os-tests/runfiles/default.run mode=0444 @@ -53,6 +58,16 @@ $(i386_ONLY)file path=opt/os-tests/tests/i386/badseg mode=0555 $(i386_ONLY)file path=opt/os-tests/tests/i386/badseg_exec mode=0555 $(i386_ONLY)file path=opt/os-tests/tests/i386/ldt mode=0555 $(i386_ONLY)file path=opt/os-tests/tests/imc_test mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_basic.32 mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_basic.64 mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_err.32 mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_err.64 mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_fini mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_init mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_sread.32 mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_sread.64 mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_stress mode=0555 +file path=opt/os-tests/tests/ksensor/ksensor_unload mode=0555 file path=opt/os-tests/tests/libtopo/digraph-test mode=0555 file path=opt/os-tests/tests/libtopo/digraph-test-in-badedge.xml mode=0444 file path=opt/os-tests/tests/libtopo/digraph-test-in-badelement.xml mode=0444 -- cgit v1.2.3