ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-19 03:06:41 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

changed pciutils to hwdata, the package which requires/installs pci.ids

Browse Source
This commit is contained in:
iadgovuser58 2024-09-09 11:59:52 -04:00
parent fa12d6f607
commit e90869153c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HIRS_AttestationCAPortal/build.gradle
View File

@ -160,7 +160,7 @@ ospackage {
requires('mariadb-server' , '10.3' , GREATER | EQUAL) requires('mariadb-server' , '10.3' , GREATER | EQUAL)
requires('procps-ng', '3.3.15', GREATER | EQUAL) requires('procps-ng', '3.3.15', GREATER | EQUAL)
requires('alternatives', '1.19', GREATER | EQUAL) requires('alternatives', '1.19', GREATER | EQUAL)
requires('pciutils', '3.7.0', GREATER | EQUAL) requires('hwdata', '0.314', GREATER | EQUAL)
// Post Trans stage (Occurs after required app and postInstall stage) // Post Trans stage (Occurs after required app and postInstall stage)
// Note postInstall wont wait for required apps // Note postInstall wont wait for required apps
postTrans 'update-alternatives --set java java-17-openjdk.x86_64' postTrans 'update-alternatives --set java java-17-openjdk.x86_64'
@ -182,7 +182,7 @@ ospackage {
requires('openjdk-17-jdk', '17.0', GREATER | EQUAL) requires('openjdk-17-jdk', '17.0', GREATER | EQUAL)
requires('mariadb-server' , '10.3' , GREATER | EQUAL) requires('mariadb-server' , '10.3' , GREATER | EQUAL)
requires('curl') requires('curl')
requires('pciutils', '3.7.0', GREATER | EQUAL) requires('hwdata', '0.314', GREATER | EQUAL)
// Install after required packages // Install after required packages
postInstall 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u' postInstall 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u'
postInstall 'bash /opt/hirs/aca/scripts/systemd/aca_enable_service.sh' postInstall 'bash /opt/hirs/aca/scripts/systemd/aca_enable_service.sh'

3
HIRS_Utils/src/main/java/hirs/utils/PciIds.java
View File

@ -29,6 +29,9 @@ public final class PciIds {
/** /**
* This pci ids file can be in different places on different distributions. * This pci ids file can be in different places on different distributions.
* Fedora/RHEL/Rocky/CentOS: /usr/share/hwdata/pci.ids
* Debian/Ubuntu: /usr/share/misc/pci.ids
* For windows, the file will have to be accessed from code (in the future can change this)
*/ */
public static final List<String> PCI_IDS_PATH = public static final List<String> PCI_IDS_PATH =
Collections.unmodifiableList(new ArrayList<>() { Collections.unmodifiableList(new ArrayList<>() {

4
tools/tcg_eventlog_tool/build.gradle
View File

@ -119,10 +119,10 @@ ospackage {
buildRpm { buildRpm {
arch = X86_64 arch = X86_64
requires('pciutils', '3.7.0', GREATER | EQUAL) requires('hwdata', '0.314', GREATER | EQUAL)
} }
buildDeb { buildDeb {
arch = 'amd64' arch = 'amd64'
requires('pciutils', '3.7.0', GREATER | EQUAL) requires('hwdata', '0.314', GREATER | EQUAL)
} }
} }