From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 678a797077eb4026a26126c98944edd67dbd99fe Date: Sun, 07 Aug 2016 15:06:07 +0100 Message-ID: <20160807140609.86B801081BA6@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0011000259078400802==" List-Id: --===============0011000259078400802== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 678a797077eb4026a26126c98944edd67dbd99fe (commit) from 1159f711c8676d63ce9e2d100790031385eb01e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 678a797077eb4026a26126c98944edd67dbd99fe Author: Jonatan Schlag Date: Sun Aug 7 15:29:44 2016 +0200 Add new package libusbredir =20 This package adds support for the use redirection of spice. It is now possible to attach USB devices of the host where the spice client run to the virtual machine. =20 The binary is not needed for this functionality and that's why they is not shipped with the package =20 This feature is also enabled in qemu. =20 Signed-off-by: Jonatan Schlag Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libusbredir | 18 ++++++++++++++++++ lfs/{intltool =3D> libusbredir} | 15 +++++++-------- lfs/qemu | 6 +++--- make.sh | 1 + 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 config/rootfiles/packages/libusbredir copy lfs/{intltool =3D> libusbredir} (93%) Difference in files: diff --git a/config/rootfiles/packages/libusbredir b/config/rootfiles/package= s/libusbredir new file mode 100644 index 0000000..d08e0b6 --- /dev/null +++ b/config/rootfiles/packages/libusbredir @@ -0,0 +1,18 @@ +#usr/include/usbredirfilter.h +#usr/include/usbredirhost.h +#usr/include/usbredirparser.h +#usr/include/usbredirproto.h +#usr/lib/libusbredirhost.a +#usr/lib/libusbredirhost.la +usr/lib/libusbredirhost.so +usr/lib/libusbredirhost.so.1 +usr/lib/libusbredirhost.so.1.0.0 +#usr/lib/libusbredirparser.a +#usr/lib/libusbredirparser.la +usr/lib/libusbredirparser.so +usr/lib/libusbredirparser.so.1 +usr/lib/libusbredirparser.so.1.0.0 +#usr/lib/pkgconfig/libusbredirhost.pc +#usr/lib/pkgconfig/libusbredirparser-0.5.pc +#usr/sbin/usbredirserver +#usr/share/man/man1/usbredirserver.1 diff --git a/lfs/libusbredir b/lfs/libusbredir new file mode 100644 index 0000000..652a60d --- /dev/null +++ b/lfs/libusbredir @@ -0,0 +1,84 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2016 IPFire Team = # +# = # +# This program is free software: you can redistribute it and/or modify = # +# it under the terms of the GNU General Public License as published by = # +# the Free Software Foundation, either version 3 of the License, or = # +# (at your option) any later version. = # +# = # +# This program is distributed in the hope that it will be useful, = # +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # +# GNU General Public License for more details. = # +# = # +# You should have received a copy of the GNU General Public License = # +# along with this program. If not, see . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 0.7.1 + +THISAPP =3D usbredir-$(VER) +DL_FILE =3D $(THISAPP).tar.bz2 +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D libusbredir +PAK_VER =3D 1 + +DEPS =3D "" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D 35cfb1720967727dea523b943cc4126b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################= ### +# Downloading, checking, md5sum +############################################################################= ### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################= ### +# Installation Details +############################################################################= ### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/qemu b/lfs/qemu index 62010ee..fb4f4b3 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,9 +33,9 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) SUP_ARCH =3D i586 x86_64 PROG =3D qemu -PAK_VER =3D 20 +PAK_VER =3D 21 =20 -DEPS =3D "sdl spice" +DEPS =3D "libusbredir sdl spice" =20 ############################################################################= ### # Top-level Rules @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc \ --enable-kvm --disable-bluez --disable-attr \ --target-list=3D"i386-linux-user x86_64-linux-user arm-linux-user i386-sof= tmmu x86_64-softmmu arm-softmmu" \ - --extra-cflags=3D"$(CFLAGS)" --enable-spice + --extra-cflags=3D"$(CFLAGS)" --enable-spice --enable-usb-redir cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install =20 diff --git a/make.sh b/make.sh index fdda3e5..efbdfb8 100755 --- a/make.sh +++ b/make.sh @@ -708,6 +708,7 @@ buildipfire() { ipfiremake spice-protocol ipfiremake spice ipfiremake sdl + ipfiremake libusbredir ipfiremake qemu ipfiremake sane ipfiremake netpbm hooks/post-receive -- IPFire 2.x development tree --===============0011000259078400802==--