diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-03 15:48:20 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-03 16:50:27 +0200 |
commit | 13fb5170cae59f39be31db28975cd925f984e60d (patch) | |
tree | 8c640b2c0ebebcfebced8ecdf97875b49de67d7c | |
parent | ae8b92c95dff49692f350f9b8e79bde854dd61b6 (diff) | |
download | aports-13fb5170cae59f39be31db28975cd925f984e60d.tar.bz2 aports-13fb5170cae59f39be31db28975cd925f984e60d.tar.xz |
main/usbutils: fix path in lsusb.py and modernize
-rw-r--r-- | main/usbutils/APKBUILD | 20 | ||||
-rw-r--r-- | main/usbutils/usbutils-006-hwdata.patch | 13 |
2 files changed, 22 insertions, 11 deletions
diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD index ef50d270b3..bf5c0f6453 100644 --- a/main/usbutils/APKBUILD +++ b/main/usbutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=usbutils pkgver=008 -pkgrel=0 +pkgrel=1 pkgdesc="USB Device Utilities" url="http://linux-usb.sourceforge.net/" arch="all" @@ -9,15 +9,14 @@ license="GPL2+" subpackages="$pkgname-doc" depends="hwdata-usb" makedepends="libusb-dev eudev-dev" -source="http://www.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz" +source="http://www.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz + usbutils-006-hwdata.patch + " -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" -} +builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,13 +29,12 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 mkdir -p "$pkgdir"/usr/lib/ mv "$pkgdir"/usr/share/pkgconfig \ "$pkgdir"/usr/lib/ } -md5sums="2780b6ae21264c888f8f30fb2aab1259 usbutils-008.tar.xz" -sha256sums="44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c usbutils-008.tar.xz" -sha512sums="ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45 usbutils-008.tar.xz" +sha512sums="ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45 usbutils-008.tar.xz +681894f85f4abe1593ca00cfa5be7d57e44d4aa90e69f94f6fc621d265c6d6c492622710f3bed3c75ee5459a634848516ad0ef1e3830075c5a55b8172c53af1e usbutils-006-hwdata.patch" diff --git a/main/usbutils/usbutils-006-hwdata.patch b/main/usbutils/usbutils-006-hwdata.patch new file mode 100644 index 0000000000..a8e3961786 --- /dev/null +++ b/main/usbutils/usbutils-006-hwdata.patch @@ -0,0 +1,13 @@ +diff --git a/lsusb.py b/lsusb.py +index 7816a5a..f18aa7f 100755 +--- a/lsusb.py ++++ b/lsusb.py +@@ -18,7 +18,7 @@ warnsort = False + showeps = False + + prefix = "/sys/bus/usb/devices/" +-usbids = "/usr/share/usb.ids" ++usbids = "/usr/share/hwdata/usb.ids" + + esc = chr(27) + norm = esc + "[0;0m" |