Merge pull request #142 from yeazelm/pciutils

Add pciutils to packages in release

Cargo.toml

@@ -107,6 +107,7 @@ members = [
   "packages/oci-add-hooks",
   "packages/open-vm-tools",
   "packages/os",
+  "packages/pciutils",
   "packages/pigz",
   "packages/policycoreutils",
   "packages/procps",

kits/bottlerocket-core-kit/Cargo.toml

@@ -117,6 +117,7 @@ nvme-cli = { path = "../../packages/nvme-cli" }
 oci-add-hooks = { path = "../../packages/oci-add-hooks" }
 open-vm-tools = { path = "../../packages/open-vm-tools" }
 os = { path = "../../packages/os" }
+pciutils = { path = "../../packages/pciutils" }
 pigz = { path = "../../packages/pigz" }
 policycoreutils = { path = "../../packages/policycoreutils" }
 procps = { path = "../../packages/procps" }

packages/pciutils/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "pciutils"
+version = "0.1.0"
+edition = "2021"
+publish = false
+build = "../build.rs"
+
+[lib]
+path = "../packages.rs"
+
+[package.metadata.build-package]
+releases-url = "https://www.kernel.org/pub/software/utils/pciutils/"
+
+[[package.metadata.build-package.external-files]]
+url = "https://www.kernel.org/pub/software/utils/pciutils/pciutils-3.13.0.tar.gz"
+sha512 = "39cf4141c87c9a39fb42ec7a2412525f4283c62a1d1aa3533eb92bae4c59d3beb9a2ab1a9fcfe89b1f6cb8f0a011ef2f32fbed3111d357ce43d9569b3d0253d9"
+
+[build-dependencies]
+glibc = { path = "../glibc" }

packages/pciutils/pciutils.spec

@@ -0,0 +1,48 @@
+Name: %{_cross_os}pciutils
+Version: 3.13.0
+Release: 1%{?dist}
+Summary: PCI bus related utilities
+License: GPL-2.0-only
+URL: https://www.kernel.org/pub/software/utils/pciutils/
+Source0:  https://mirrors.edge.kernel.org/pub/software/utils/pciutils/pciutils-%{version}.tar.gz
+BuildRequires: %{_cross_os}glibc-devel
+
+%description
+%{summary}.
+
+%prep
+%autosetup -n pciutils-%{version} -p1
+
+%global pciutils_make \
+make\\\
+  CROSS_COMPILE="%{_cross_target}-"\\\
+  HOST="%{_cross_arch}-linux"\\\
+  OPT="%{_cross_cflags}"\\\
+  LDFLAGS="%{_cross_ldflags}"\\\
+  PREFIX="%{_cross_prefix}"\\\
+  LIBDIR="%{_cross_libdir}"\\\
+  MANDIR="%{_cross_mandir}"\\\
+  DESTDIR="%{buildroot}"\\\
+  STRIP=""\\\
+  SHARED=no\\\
+  DNS=no\\\
+  HWDB=no\\\
+  LIBKMOD=no\\\
+  ZLIB=no\\\
+%{nil}
+
+%build
+%pciutils_make
+
+%install
+%pciutils_make install
+
+%files
+%license COPYING
+%{_cross_attribution_file}
+%{_cross_bindir}/lspci
+%{_cross_datadir}/pci.ids
+%exclude %{_cross_sbindir}/pcilmr
+%exclude %{_cross_sbindir}/setpci
+%exclude %{_cross_sbindir}/update-pciids
+%exclude %{_cross_mandir}

packages/release/Cargo.toml

@@ -45,6 +45,7 @@ makedumpfile = { path = "../../packages/makedumpfile" }
 netdog = {path = "../netdog" }
 os = { path = "../os" }
 oci-add-hooks = { path = "../oci-add-hooks" }
+pciutils = { path = "../pciutils" }
 policycoreutils = { path = "../policycoreutils" }
 procps = { path = "../procps" }
 selinux-policy = { path = "../selinux-policy" }

packages/release/release.spec

@@ -124,6 +124,7 @@ Requires: %{_cross_os}makedumpfile
 Requires: %{_cross_os}mdadm
 Requires: %{_cross_os}netdog
 Requires: %{_cross_os}os
+Requires: %{_cross_os}pciutils
 Requires: %{_cross_os}policycoreutils
 Requires: %{_cross_os}procps
 Requires: %{_cross_os}selinux-policy