From da01bdf27d76c6afe2eb72fc8a1607480a739762 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Fri, 10 May 2024 00:20:15 +0100 Subject: [PATCH] fix: add pciutils dependency (#1186) * fix: add pciutils dependency required for quickreport Todo: add to docs and nix * fix: add pciutils dependecy to nix * docs: document pciutils dependency * chore:deconflict submodule --- debian/control | 1 + devshell.nix | 2 ++ docs/quickemu.1 | 13 ++++++++----- docs/quickemu.1.md | 8 ++++---- docs/quickget.1 | 2 -- docs/quickget.1.md | 1 - package.nix | 2 ++ 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/debian/control b/debian/control index 7191dec..d409b98 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Depends: curl, genisoimage, jq, + pciutils procps, python3-minimal, qemu-system (>= 6.0), diff --git a/devshell.nix b/devshell.nix index 4f3dbe8..b455a4e 100644 --- a/devshell.nix +++ b/devshell.nix @@ -8,6 +8,7 @@ jq, ncurses, nixpkgs-fmt, + pciutils, procps, python3, qemu, @@ -34,6 +35,7 @@ mkShell { ncurses nixpkgs-fmt procps + pciutils python3 qemu socat diff --git a/docs/quickemu.1 b/docs/quickemu.1 index 332021c..3abafee 100644 --- a/docs/quickemu.1 +++ b/docs/quickemu.1 @@ -271,6 +271,11 @@ jq .UE \c .IP \[bu] 2 \c +.UR https://github.com/pciutils/pciutils +pciutils +.UE \c +.IP \[bu] 2 +\c .UR https://gitlab.com/procps-ng/procps procps .UE \c @@ -361,12 +366,12 @@ These examples may save a little typing: This also applies to derivatives: .IP .EX -sudo apt install qemu bash coreutils curl ovmf grep jq procps python3 genisoimage usbutils util\-linux sed socat spice\-client\-gtk libtss2\-tcti\-swtpm0 xdg\-user\-dirs zsync unzip +sudo apt install qemu bash coreutils curl ovmf grep jq pciutils procps python3 genisoimage usbutils util\-linux sed socat spice\-client\-gtk libtss2\-tcti\-swtpm0 xdg\-user\-dirs zsync unzip .EE .SS Install requirements on Fedora hosts .IP .EX -sudo dnf install qemu bash coreutils curl edk2\-tools grep jq procps python3 genisoimage usbutils util\-linux sed socat spice\-gtk\-tools swtpm xdg\-user\-dirs xrandr unzip +sudo dnf install qemu bash coreutils curl edk2\-tools grep jq pciutils procps python3 genisoimage usbutils util\-linux sed socat spice\-gtk\-tools swtpm xdg\-user\-dirs xrandr unzip .EE .SS Install requirements on macOS hosts This is a \f[B]work in progress\f[R] (see \c @@ -376,7 +381,7 @@ issue 248 \ for other steps and changes that may enable running on MacOS) .IP .EX -brew install qemu bash coreutils curl grep jq python\[at]3.10 cdrtools gnu\-sed spice\-gtk zsync +brew install qemu bash coreutils curl grep jq pciutils python\[at]3.10 cdrtools gnu\-sed spice\-gtk zsync .EE .SS \c .UR https://github.com/quickemu-project/quickemu/wiki/07-Alternative-frontends @@ -691,8 +696,6 @@ wiki .IP \[bu] 2 \f[CR]slax\f[R] (Slax) .IP \[bu] 2 -\f[CR]slint\f[R] (Slint) -.IP \[bu] 2 \f[CR]slitaz\f[R] (SliTaz) .IP \[bu] 2 \f[CR]solus\f[R] (Solus) diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md index 7d9e427..2313cf7 100644 --- a/docs/quickemu.1.md +++ b/docs/quickemu.1.md @@ -206,6 +206,7 @@ requirements manually: - [EDK II](https://github.com/tianocore/edk2) - [grep](https://www.gnu.org/software/grep/) - [jq](https://stedolan.github.io/jq/) +- [pciutils](https://github.com/pciutils/pciutils) - [procps](https://gitlab.com/procps-ng/procps) - [python3](https://www.python.org/) - [chunkcheck](https://gist.github.com/MCJack123/943eaca762730ca4b7ae460b731b68e7) @@ -236,13 +237,13 @@ These examples may save a little typing: This also applies to derivatives: ``` shell -sudo apt install qemu bash coreutils curl ovmf grep jq procps python3 genisoimage usbutils util-linux sed socat spice-client-gtk libtss2-tcti-swtpm0 xdg-user-dirs zsync unzip +sudo apt install qemu bash coreutils curl ovmf grep jq pciutils procps python3 genisoimage usbutils util-linux sed socat spice-client-gtk libtss2-tcti-swtpm0 xdg-user-dirs zsync unzip ``` #### Install requirements on Fedora hosts ``` shell -sudo dnf install qemu bash coreutils curl edk2-tools grep jq procps python3 genisoimage usbutils util-linux sed socat spice-gtk-tools swtpm xdg-user-dirs xrandr unzip +sudo dnf install qemu bash coreutils curl edk2-tools grep jq pciutils procps python3 genisoimage usbutils util-linux sed socat spice-gtk-tools swtpm xdg-user-dirs xrandr unzip ``` #### Install requirements on macOS hosts @@ -252,7 +253,7 @@ This is a **work in progress** (see [issue steps and changes that may enable running on MacOS) ``` shell -brew install qemu bash coreutils curl grep jq python@3.10 cdrtools gnu-sed spice-gtk zsync +brew install qemu bash coreutils curl grep jq pciutils python@3.10 cdrtools gnu-sed spice-gtk zsync ``` ## [Alternative Frontends](https://github.com/quickemu-project/quickemu/wiki/07-Alternative-frontends) @@ -454,7 +455,6 @@ Further information is available from the project - `siduction` (Siduction) - `slackware` (Slackware) - `slax` (Slax) -- `slint` (Slint) - `slitaz` (SliTaz) - `solus` (Solus) - `sparkylinux` (SparkyLinux) diff --git a/docs/quickget.1 b/docs/quickget.1 index 49971e0..63d4aef 100644 --- a/docs/quickget.1 +++ b/docs/quickget.1 @@ -281,8 +281,6 @@ wiki .IP \[bu] 2 \f[CR]slax\f[R] (Slax) .IP \[bu] 2 -\f[CR]slint\f[R] (Slint) -.IP \[bu] 2 \f[CR]slitaz\f[R] (SliTaz) .IP \[bu] 2 \f[CR]solus\f[R] (Solus) diff --git a/docs/quickget.1.md b/docs/quickget.1.md index af03206..c3b2f75 100644 --- a/docs/quickget.1.md +++ b/docs/quickget.1.md @@ -209,7 +209,6 @@ Further information is available from the project - `siduction` (Siduction) - `slackware` (Slackware) - `slax` (Slax) -- `slint` (Slint) - `slitaz` (SliTaz) - `solus` (Solus) - `sparkylinux` (SparkyLinux) diff --git a/package.nix b/package.nix index a9d8649..742ab1e 100644 --- a/package.nix +++ b/package.nix @@ -10,6 +10,7 @@ , gnused , jq , ncurses +, pciutils , procps , python3 , qemu @@ -33,6 +34,7 @@ let gnused jq ncurses + pciutils procps python3 qemu