[weasel-commit] Source: usbutils=0.86-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Thu, 14 Jan 2010 12:38:25 -0500
================================
usbutils:source=0.86-1 (previous: 0.73-1)
cvc rdiff usbutils -1 /weasel.rpath.org@wgl:3-devel/0.86-1
================================
0.86-1 Filip Brcic (brcha@xxxxxxx) Thu Jan 14 12:38:14 2010
version bump + metadata
usbutils.recipe: changed
Index: usbutils.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- usbutils.recipe /weasel.rpath.org@wgl:3-devel/0.73-1
+++ usbutils.recipe /weasel.rpath.org@wgl:3-devel/0.86-1
@@ -1,18 +1,44 @@
#
-# Copyright (c) 2004-2006 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
-class Usbutils(CPackageRecipe):
+class Usbutils(AutoPackageRecipe):
name = 'usbutils'
- version = '0.73'
+ version = '0.86'
- buildRequires = [ 'libusb:devel' ]
+ buildRequires = [
+ 'libusb:devel', 'pkg-config:devel', 'zlib:devel',
+ ]
- def setup(r):
+ shortDesc = 'USB enumeration utilities'
+ url = 'http://linux-usb.sourceforge.net/'
+ licenses = [ 'GPL-2' ]
+ categories = [ 'System' ]
+
+ def unpack(r):
r.addArchive('mirror://sourceforge/linux-usb/')
- r.Configure('--sbindir=%(essentialsbindir)s')
- r.Make()
- r.MakeInstall()
+ r.addPatch('usbutils-0.82-fbsd.patch')
+
+ r.Replace('datadir', 'datarootdir',
+ 'Makefile.in',
+ lines='^pkgconfigdir')
+
+ def configure(r):
+ r.Configure(
+ ' --datarootdir=%(datadir)s'
+ ' --datadir=%(datadir)s/misc'
+ ' --enable-zlib'
+ )
+
+ def policy(r):
+ r.addSource('usbmodules.sh',
+ dest='%(bindir)s/usbmodules',
+ mode=0755)
+ r.Install('update-usbids.sh',
+ '%(sbindir)s/update-usbids')
+
+ r.addSource('usbutils.cron',
+ dest='%(sysconfdir)s/cron.monthly/update-usbids',
+ mode=0755)
usbutils.cron: new
--- /dev/null
+++ usbutils.cron
@@ -0,0 +2 @@
+#!/bin/sh
+exec /usr/sbin/update-usbids -q
usbmodules.sh: new
--- /dev/null
+++ usbmodules.sh
@@ -0,0 +55 @@
+#!/bin/sh
+
+usage() {
+ cat <<-EOF
+ List relevant kernel modules for USB devices currently plugged in. The
+ module list is taken from the modules installed in /lib/modules/<ver>/.
+
+ Usage: usbmodules [options] [kernel version]
+
+ Options:
+ -m, --map <map> Specify usbmap (default:
/lib/modules/<ver>/modules.usbmap)
+ -h, --help This help screen
+ EOF
+ if [ -n "$*" ] ; then
+ echo
+ echo "Error: $*" 1>&2
+ exit 1
+ else
+ exit 0
+ fi
+}
+
+map=""
+
+while [ -n "$1" ] ; do
+ case $1 in
+ -m|--map) map=$2; shift;;
+ -h|--help) usage;;
+ --) break;;
+ -*) usage "unknown option '$1'";;
+ *) break;;
+ esac
+ shift
+done
+
+ver=${1:-$(uname -r)}
+map=${map:-/lib/modules/${ver}/modules.usbmap}
+
+for dev in $(lsusb | awk '{print $6}') ; do
+ [ "${dev}" = "0000:0000" ] && continue
+
+ IFS=:
+ set -- ${dev}
+ vendor=$1
+ product=$2
+ unset IFS
+
+ awk \
+ -v vendor="0x${vendor}" \
+ -v product="0x${product}" \
+ 'vendor == $3 && product == $4 {print $1}' \
+ ${map}
+done
+
+exit 0
usbutils-0.86.tar.gz: new
usbutils-0.82-fbsd.patch: new
--- /dev/null
+++ usbutils-0.82-fbsd.patch
@@ -0,0 +14 @@
+http://bugs.gentoo.org/275052
+
+--- usbutils-0.82/lsusb.c
++++ usbutils-0.82/lsusb.c
+@@ -32,7 +32,9 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#ifndef __FreeBSD__
+ #include <byteswap.h>
++#endif
+ #include <usb.h>
+
+ #include "names.h"
usbutils-0.73.tar.gz: removed
Committed by: brcha
Other related posts:
