From 34774109103b566618dca5e2bfc8441c2c5d8225 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 25 Nov 2025 19:33:12 +0200 Subject: [PATCH] Switch to new download format and prevent conflicts with hwdata --- pkg.info | 6 ++++++ source.sh | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkg.info b/pkg.info index 460ef4f..4a0eaf7 100644 --- a/pkg.info +++ b/pkg.info @@ -1,7 +1,13 @@ name: pciutils description: Utilities for listing and inspecting PCI devices version: 3.14.0 +revision: 2 url: https://mj.ucw.cz/sw/pciutils/ license: GPL2 architecture: any type: source +downloads: + - url: https://mj.ucw.cz/download/linux/pci/pciutils-${BPM_PKG_VERSION}.tar.gz + extract_to: ${BPM_SOURCE} + extract_strip_components: 1 + checksum: e31c79722dbbe9d2906b92996ce295268e54d4342fefe3ff476caa613e51be2a diff --git a/source.sh b/source.sh index 1ddedf1..fe3eb30 100644 --- a/source.sh +++ b/source.sh @@ -2,14 +2,11 @@ # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT -DOWNLOAD="https://mj.ucw.cz/download/linux/pci/pciutils-${BPM_PKG_VERSION}.tar.gz" -FILENAME="${DOWNLOAD##*/}" - # The prepare function is executed in the root of the temp directory -# This function is used for downloading files and putting them into the correct location +# This function is used for putting downloaded files to the correct location or applying patches prepare() { - wget "$DOWNLOAD" - tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" + cd "$BPM_SOURCE" + sed -i -r '/INSTALL/{/PCI_IDS|update-pciids /d; s/update-pciids.8//}' Makefile } # The build function is executed in the source directory @@ -22,6 +19,10 @@ build() { # This function is used to move the compiled files into the output directory package() { make DESTDIR="$BPM_OUTPUT" PREFIX=/usr SHAREDIR=/usr/share/hwdata SHARED=yes install install-lib - chmod -v 755 "$BPM_OUTPUT"/usr/lib/libpci.so + + # Fix shared library permissions + chmod 755 "$BPM_OUTPUT"/usr/lib/libpci.so + + # Install package license install -Dm 644 COPYING "$BPM_OUTPUT"/usr/share/licenses/pciutils/COPYING }