diff options
| -rw-r--r-- | libre/linux-libre-tools/04-fix-usip-h-path.patch | 13 | ||||
| -rw-r--r-- | libre/linux-libre-tools/PKGBUILD | 25 |
2 files changed, 26 insertions, 12 deletions
diff --git a/libre/linux-libre-tools/04-fix-usip-h-path.patch b/libre/linux-libre-tools/04-fix-usip-h-path.patch new file mode 100644 index 000000000..2d9abce0a --- /dev/null +++ b/libre/linux-libre-tools/04-fix-usip-h-path.patch @@ -0,0 +1,13 @@ +# Copyright 2014 Sébastien Luttringer + +--- a/tools/usb/usbip/libsrc/usbip_common.h 2014-10-06 02:13:09.295856364 +0200 ++++ b/tools/usb/usbip/libsrc/usbip_common.h 2014-10-06 02:13:03.607873728 +0200 +@@ -15,7 +15,7 @@ + #include <syslog.h> + #include <unistd.h> + #include <linux/usb/ch9.h> +-#include <linux/usbip.h> ++#include "../../../include/uapi/linux/usbip.h" + + #ifndef USBIDS_FILE + #define USBIDS_FILE "/usr/share/hwdata/usb.ids" diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index a0dc15e0b..c110c6b47 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -17,13 +17,13 @@ _pkgname=( ) pkgname=("${pkgbase}-meta" "${_pkgname[@]/#/${pkgbase}-}") -_pkgbasever=3.16-gnu -_pkgver=3.16-gnu +_pkgbasever=3.17-gnu +_pkgver=3.17-gnu _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1.5 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -32,7 +32,7 @@ options=('!strip') makedepends=('asciidoc' 'xmlto') # split packages need all package dependencies set manually in makedepends declare -A _depends -_depends[perf]='perl python2 libnewt elfutils libunwind numactl' +_depends[perf]='perl python2 libnewt elfutils libunwind numactl audit' _depends[cpupower]='pciutils' _depends[usbip]='glib2 sysfsutils libsystemd' makedepends+=(systemd) # libsystemd for runtime, systemd for make. IDK, it's what Arch does @@ -48,15 +48,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'usbipd.service' '01-fix-perf-python.patch' '02-parabola-paths.patch' - '03-fix-tmon-ltinfo.patch') -sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' + '03-fix-tmon-ltinfo.patch' + '04-fix-usip-h-path.patch') +sha256sums=('3b2e9a862ada390a318f95d5a436d07dd32664434f4f383e27fd5cc0b4f41f0e' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a' 'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570' - '7547815bb761d49d198b85f95011535713c2ed4a004f249a9cf6ba985af8c4ed') + '7547815bb761d49d198b85f95011535713c2ed4a004f249a9cf6ba985af8c4ed' + 'e5543d8d6d3fbc7f8d9d25c428a882737d2e0169455f70cbc3f73076ff33dd5d') prepare() { cd $_srcname @@ -69,6 +71,7 @@ prepare() { patch -N -p1 -i "$srcdir/01-fix-perf-python.patch" patch -N -p1 -i "$srcdir/02-parabola-paths.patch" patch -N -p1 -i "$srcdir/03-fix-tmon-ltinfo.patch" + patch -N -p1 -i "$srcdir/04-fix-usip-h-path.patch" } build() { @@ -103,9 +106,7 @@ build() { popd msg2 'usbip' - pushd $_srcname/drivers/staging/usbip/userspace - # fix missing man page - sed -i 's/usbip_bind_driver.8//' Makefile.am + pushd $_srcname/tools/usb/usbip ./autogen.sh ./configure --prefix=/usr --sbindir=/usr/bin make @@ -142,7 +143,7 @@ _package_libtraceevent() { cd $_srcname/tools/lib/traceevent install -dm 755 "$pkgdir/usr/lib" - install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib" + install -m 644 libtraceevent.so "$pkgdir/usr/lib" } _package_perf() { @@ -199,7 +200,7 @@ _package_x86_energy_perf_policy() { _package_usbip() { pkgdesc='An USB device sharing system over IP network' - pushd $_srcname/drivers/staging/usbip/userspace + pushd $_srcname/tools/usb/usbip make install DESTDIR="$pkgdir" popd # module loading |