Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pciutils to packages in release #142

Merged
merged 1 commit into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ members = [
"packages/oci-add-hooks",
"packages/open-vm-tools",
"packages/os",
"packages/pciutils",
"packages/pigz",
"packages/policycoreutils",
"packages/procps",
Expand Down
1 change: 1 addition & 0 deletions kits/bottlerocket-core-kit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
19 changes: 19 additions & 0 deletions packages/pciutils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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" }
48 changes: 48 additions & 0 deletions packages/pciutils/pciutils.spec
Original file line number Diff line number Diff line change
@@ -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}
1 change: 1 addition & 0 deletions packages/release/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
1 change: 1 addition & 0 deletions packages/release/release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down