From 4bce0598ceb8914a71b614e72e1e821d9f6182ff Mon Sep 17 00:00:00 2001
From: Matthew Yeazel <yeazelm@amazon.com>
Date: Wed, 4 Sep 2024 17:42:09 +0000
Subject: [PATCH] packages: add pciutils to packages in release

This adds the pciutils package to the release package dependencies so
that lspci is available for debugging devices on Bottlerocket images.

Signed-off-by: Matthew Yeazel <yeazelm@amazon.com>
---
 Cargo.lock                            |  9 +++++
 Cargo.toml                            |  1 +
 kits/bottlerocket-core-kit/Cargo.toml |  1 +
 packages/pciutils/Cargo.toml          | 19 +++++++++++
 packages/pciutils/pciutils.spec       | 48 +++++++++++++++++++++++++++
 packages/release/Cargo.toml           |  1 +
 packages/release/release.spec         |  1 +
 7 files changed, 80 insertions(+)
 create mode 100644 packages/pciutils/Cargo.toml
 create mode 100644 packages/pciutils/pciutils.spec

diff --git a/Cargo.lock b/Cargo.lock
index 1e3cc4ade..9b82cfed9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -153,6 +153,7 @@ dependencies = [
  "oci-add-hooks",
  "open-vm-tools",
  "os",
+ "pciutils",
  "pigz",
  "policycoreutils",
  "procps",
@@ -929,6 +930,13 @@ dependencies = [
  "glibc",
 ]
 
+[[package]]
+name = "pciutils"
+version = "0.1.0"
+dependencies = [
+ "glibc",
+]
+
 [[package]]
 name = "pigz"
 version = "0.1.0"
@@ -996,6 +1004,7 @@ dependencies = [
  "nvme-cli",
  "oci-add-hooks",
  "os",
+ "pciutils",
  "policycoreutils",
  "procps",
  "selinux-policy",
diff --git a/Cargo.toml b/Cargo.toml
index abc8b427b..203f2b654 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,6 +104,7 @@ members = [
   "packages/oci-add-hooks",
   "packages/open-vm-tools",
   "packages/os",
+  "packages/pciutils",
   "packages/pigz",
   "packages/policycoreutils",
   "packages/procps",
diff --git a/kits/bottlerocket-core-kit/Cargo.toml b/kits/bottlerocket-core-kit/Cargo.toml
index d142c9108..bf6d35c30 100644
--- a/kits/bottlerocket-core-kit/Cargo.toml
+++ b/kits/bottlerocket-core-kit/Cargo.toml
@@ -114,6 +114,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" }
diff --git a/packages/pciutils/Cargo.toml b/packages/pciutils/Cargo.toml
new file mode 100644
index 000000000..91fd47209
--- /dev/null
+++ b/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" }
diff --git a/packages/pciutils/pciutils.spec b/packages/pciutils/pciutils.spec
new file mode 100644
index 000000000..37916ba26
--- /dev/null
+++ b/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}
diff --git a/packages/release/Cargo.toml b/packages/release/Cargo.toml
index a99c9e27d..f2d41eafe 100644
--- a/packages/release/Cargo.toml
+++ b/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" }
diff --git a/packages/release/release.spec b/packages/release/release.spec
index 530a5b685..93d60dc5c 100644
--- a/packages/release/release.spec
+++ b/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