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

Conversation

yeazelm
Copy link
Contributor

@yeazelm yeazelm commented Sep 10, 2024

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

Testing done:
Booted an image and checked lspci works on x86_64 and aarch64

aarch t4g.large

[root@admin]# sheltie
bash-5.1# lspci
00:00.0 Host bridge: Amazon.com, Inc. Device 0200
00:01.0 Serial controller: Amazon.com, Inc. Device 8250
00:04.0 Non-Volatile memory controller: Amazon.com, Inc. NVMe EBS Controller
00:05.0 Ethernet controller: Amazon.com, Inc. Elastic Network Adapter (ENA)
00:1f.0 Non-Volatile memory controller: Amazon.com, Inc. NVMe EBS Controller

NVIDIA x86_64

[root@admin]# sheltie
bash-5.1# lspci
00:00.0 Host bridge: Intel Corporation 440FX - 82441FX PMC [Natoma]
00:01.0 ISA bridge: Intel Corporation 82371SB PIIX3 ISA [Natoma/Triton II]
00:01.3 Non-VGA unclassified device: Intel Corporation 82371AB/EB/MB PIIX4 ACPI (rev 08)
00:03.0 VGA compatible controller: Amazon.com, Inc. Device 1111
00:04.0 Non-Volatile memory controller: Amazon.com, Inc. NVMe EBS Controller
00:05.0 Ethernet controller: Amazon.com, Inc. Elastic Network Adapter (ENA)
00:1d.0 Non-Volatile memory controller: Amazon.com, Inc. NVMe EBS Controller
00:1e.0 3D controller: NVIDIA Corporation TU104GL [Tesla T4] (rev a1)
00:1f.0 Non-Volatile memory controller: Amazon.com, Inc. NVMe SSD Controller

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

path = "../packages.rs"

[package.metadata.build-package]
releases-url = "https://mj.ucw.cz/download/linux/pci/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: pciutils is also available at https://www.kernel.org/pub/software/utils/pciutils/. Should we use that for consistency? We have a good number of packages that consume from kernel.org.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, I had switched in the spec file and not here.

@yeazelm yeazelm force-pushed the pciutils branch 3 times, most recently from 6257a42 to 21fedf6 Compare September 10, 2024 23:34
Comment on lines 1 to 2
%global debug_package %{nil}
%global __strip %{_bindir}/true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't need these.

Suggested change
%global debug_package %{nil}
%global __strip %{_bindir}/true

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice call! I added these when trying things but they are not needed!

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>
@yeazelm
Copy link
Contributor Author

yeazelm commented Sep 11, 2024

^ removed extra lines per comments.

@yeazelm yeazelm merged commit 698a70b into bottlerocket-os:develop Sep 11, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants