From c7dfc8d91b1189726e5dcf79897adbface685b65 Mon Sep 17 00:00:00 2001 From: Mike Kazantsev Date: Mon, 3 Oct 2011 16:31:36 +0600 Subject: [PATCH] usbip: fixed scm build and repository path --- packages/sys-apps/usbip/usbip-0.1.7.exheres-0 | 2 ++ packages/sys-apps/usbip/usbip-scm.exheres-0 | 14 +++++++++++++- packages/sys-apps/usbip/usbip.exlib | 2 -- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/sys-apps/usbip/usbip-0.1.7.exheres-0 b/packages/sys-apps/usbip/usbip-0.1.7.exheres-0 index bcd5a5e..72663e6 100644 --- a/packages/sys-apps/usbip/usbip-0.1.7.exheres-0 +++ b/packages/sys-apps/usbip/usbip-0.1.7.exheres-0 @@ -6,3 +6,5 @@ require usbip SLOT="0" PLATFORMS="~amd64" +WORK="${WORK}/src" + diff --git a/packages/sys-apps/usbip/usbip-scm.exheres-0 b/packages/sys-apps/usbip/usbip-scm.exheres-0 index ebf7861..07f50bf 100644 --- a/packages/sys-apps/usbip/usbip-scm.exheres-0 +++ b/packages/sys-apps/usbip/usbip-scm.exheres-0 @@ -1,7 +1,7 @@ # Copyright 2008 Daniel Mierswa # Distributed under the terms of the GNU General Public License v2 -SCM_REPOSITORY="https://${PN}.svn.sourceforge.net/svnroot/${PN}/linux" +SCM_REPOSITORY="https://${PN}.svn.sourceforge.net/svnroot/${PN}/obsolete/linux" require usbip scm-svn @@ -9,3 +9,15 @@ DOWNLOADS="" SLOT="0" PLATFORMS="~amd64" +DEFAULT_SRC_CONFIGURE_PARAMS+=( --includedir=/usr/include ) + +src_prepare() { + edo sed \ + -e "/^AM_CFLAGS = /s:= := -DUSBIDS_FILE='\"@USBIDS_DIR@/usb.ids\"' :" \ + -i Makefile.am + edo sed \ + -e '/usbip_stub_driver_name =/s:usbip-host:usbip:' \ + -i libsrc/stub_driver.c + autotools_src_prepare +} + diff --git a/packages/sys-apps/usbip/usbip.exlib b/packages/sys-apps/usbip/usbip.exlib index 652483b..1e757c5 100644 --- a/packages/sys-apps/usbip/usbip.exlib +++ b/packages/sys-apps/usbip/usbip.exlib @@ -28,8 +28,6 @@ UPSTREAM_RELEASE_NOTES="${UPSTREAM_CHANGELOG}" DEFAULT_SRC_CONFIGURE_PARAMS+=( '--with-usbids-dir=/usr/share/misc' '--disable-usbids-install' ) DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=( 'tcpd tcp-wrappers' ) -WORK="${WORK}/src" - src_prepare() { edo sed \ -e "/^AM_CFLAGS = /s:= := -DUSBIDS_FILE='\"@USBIDS_DIR@/usb.ids\"' :" \