This patch series contains all required packages for spice and spice itself. Spice provides a protocol similar to vnc but is faster and support more options (audio). I hope these patches are ok so far.
Just as a question how did the project deal with patches? Should I wait till I get feedback for my first patches or should I send the next patches for libvirt?
Regards Jonatan
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/opus | 13 +++++++ lfs/opus | 83 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 config/rootfiles/packages/opus create mode 100644 lfs/opus
diff --git a/config/rootfiles/packages/opus b/config/rootfiles/packages/opus new file mode 100644 index 0000000..c102c05 --- /dev/null +++ b/config/rootfiles/packages/opus @@ -0,0 +1,13 @@ +usr/lib/libopus.a +usr/lib/libopus.la +usr/lib/libopus.so +usr/lib/libopus.so.0 +usr/lib/libopus.so.0.5.2 +usr/lib/pkgconfig/opus.pc +#usr/local/include/opus +#usr/local/include/opus/opus.h +#usr/local/include/opus/opus_defines.h +#usr/local/include/opus/opus_multistream.h +#usr/local/include/opus/opus_types.h +usr/local/share/aclocal +usr/local/share/aclocal/opus.m4 diff --git a/lfs/opus b/lfs/opus new file mode 100644 index 0000000..18260a9 --- /dev/null +++ b/lfs/opus @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.1.2 + +THISAPP = opus-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = opus +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 1f08a661bc72930187893a07f3741a91 + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --libdir=/usr/lib + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD)
Hi,
could you please always use --prefix=/usr? In that way nothing should be installed in /usr/local. Pretty much nothing should go there. Some packages install files there, but those should be moved soon.
Best, -Michael
On Mon, 2016-03-21 at 19:47 +0100, Jonatan Schlag wrote:
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/rootfiles/packages/opus | 13 +++++++ lfs/opus | 83 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 config/rootfiles/packages/opus create mode 100644 lfs/opus
diff --git a/config/rootfiles/packages/opus b/config/rootfiles/packages/opus new file mode 100644 index 0000000..c102c05 --- /dev/null +++ b/config/rootfiles/packages/opus @@ -0,0 +1,13 @@ +usr/lib/libopus.a +usr/lib/libopus.la +usr/lib/libopus.so +usr/lib/libopus.so.0 +usr/lib/libopus.so.0.5.2 +usr/lib/pkgconfig/opus.pc +#usr/local/include/opus +#usr/local/include/opus/opus.h +#usr/local/include/opus/opus_defines.h +#usr/local/include/opus/opus_multistream.h +#usr/local/include/opus/opus_types.h +usr/local/share/aclocal +usr/local/share/aclocal/opus.m4 diff --git a/lfs/opus b/lfs/opus new file mode 100644 index 0000000..18260a9 --- /dev/null +++ b/lfs/opus @@ -0,0 +1,83 @@ +############################################################################# ## +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################# ##
+############################################################################# ## +# Definitions +############################################################################# ##
+include Config
+VER = 1.1.2
+THISAPP = opus-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = opus +PAK_VER = 1
+DEPS = ""
+############################################################################# ## +# Top-level Rules +############################################################################# ##
+objects = $(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE)_MD5 = 1f08a661bc72930187893a07f3741a91
+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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --libdir=/usr/lib
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/python-pyparsing | 9 ++++ lfs/python-pyparsing | 82 ++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 config/rootfiles/packages/python-pyparsing create mode 100644 lfs/python-pyparsing
diff --git a/config/rootfiles/packages/python-pyparsing b/config/rootfiles/packages/python-pyparsing new file mode 100644 index 0000000..bd7533a --- /dev/null +++ b/config/rootfiles/packages/python-pyparsing @@ -0,0 +1,9 @@ +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO +usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/PKG-INFO +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/SOURCES.txt +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/dependency_links.txt +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/not-zip-safe +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/top_level.txt +usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.py +usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.pyc diff --git a/lfs/python-pyparsing b/lfs/python-pyparsing new file mode 100644 index 0000000..f84253b --- /dev/null +++ b/lfs/python-pyparsing @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.0.7 + +THISAPP = pyparsing-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python-pyparsing +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 1c8bed7530642ca19197f3caa05fd28b + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python setup.py install + @rm -rf $(DIR_APP) + @$(POSTBUILD)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/python-six | 9 ++++ lfs/python-six | 82 ++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 config/rootfiles/packages/python-six create mode 100644 lfs/python-six
diff --git a/config/rootfiles/packages/python-six b/config/rootfiles/packages/python-six new file mode 100644 index 0000000..8980534 --- /dev/null +++ b/config/rootfiles/packages/python-six @@ -0,0 +1,9 @@ +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO +usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/PKG-INFO +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/SOURCES.txt +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/dependency_links.txt +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/not-zip-safe +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/top_level.txt +usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.py +usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.pyc diff --git a/lfs/python-six b/lfs/python-six new file mode 100644 index 0000000..d210e4c --- /dev/null +++ b/lfs/python-six @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.10.0 + +THISAPP = six-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python-six +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 34eed507548117b2ab523ab14b2f8b55 + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python setup.py install + @rm -rf $(DIR_APP) + @$(POSTBUILD)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/spice-protocol | 30 ++++++++++++ lfs/spice-protocol | 84 ++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 config/rootfiles/packages/spice-protocol create mode 100644 lfs/spice-protocol
diff --git a/config/rootfiles/packages/spice-protocol b/config/rootfiles/packages/spice-protocol new file mode 100644 index 0000000..330403a --- /dev/null +++ b/config/rootfiles/packages/spice-protocol @@ -0,0 +1,30 @@ +#usr/include/spice-1 +#usr/include/spice-1/spice +#usr/include/spice-1/spice/barrier.h +#usr/include/spice-1/spice/controller_prot.h +#usr/include/spice-1/spice/end-packed.h +#usr/include/spice-1/spice/enums.h +#usr/include/spice-1/spice/error_codes.h +#usr/include/spice-1/spice/foreign_menu_prot.h +#usr/include/spice-1/spice/ipc_ring.h +#usr/include/spice-1/spice/macros.h +#usr/include/spice-1/spice/protocol.h +#usr/include/spice-1/spice/qxl_dev.h +#usr/include/spice-1/spice/qxl_windows.h +#usr/include/spice-1/spice/start-packed.h +#usr/include/spice-1/spice/stats.h +#usr/include/spice-1/spice/types.h +#usr/include/spice-1/spice/vd_agent.h +#usr/include/spice-1/spice/vdi_dev.h +#usr/lib/spice-protocol +usr/lib/spice-protocol/python_modules +usr/lib/spice-protocol/python_modules/__init__.py +usr/lib/spice-protocol/python_modules/codegen.py +usr/lib/spice-protocol/python_modules/demarshal.py +usr/lib/spice-protocol/python_modules/marshal.py +usr/lib/spice-protocol/python_modules/ptypes.py +usr/lib/spice-protocol/python_modules/spice_parser.py +usr/lib/spice-protocol/spice.proto +usr/lib/spice-protocol/spice1.proto +usr/lib/spice-protocol/spice_codegen.py +usr/share/pkgconfig/spice-protocol.pc diff --git a/lfs/spice-protocol b/lfs/spice-protocol new file mode 100644 index 0000000..514dec7 --- /dev/null +++ b/lfs/spice-protocol @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.12.10 + +THISAPP = spice-protocol-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = spice-protocol +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 1fb9d0dcdd42dce1b476ae8aa7569bcc + +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=/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD)
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/spice | 23 +++++++++++ lfs/spice | 84 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 config/rootfiles/packages/spice create mode 100644 lfs/spice
diff --git a/config/rootfiles/packages/spice b/config/rootfiles/packages/spice new file mode 100644 index 0000000..f67bfd0 --- /dev/null +++ b/config/rootfiles/packages/spice @@ -0,0 +1,23 @@ +#usr/include/spice-server +#usr/include/spice-server/spice-audio.h +#usr/include/spice-server/spice-char.h +#usr/include/spice-server/spice-core.h +#usr/include/spice-server/spice-experimental.h +#usr/include/spice-server/spice-input.h +#usr/include/spice-server/spice-migration.h +#usr/include/spice-server/spice-qxl.h +#usr/include/spice-server/spice-server.h +#usr/include/spice-server/spice-version.h +#usr/include/spice-server/spice.h +usr/lib/libspice-server.a +usr/lib/libspice-server.la +usr/lib/libspice-server.so +usr/lib/libspice-server.so.1 +usr/lib/libspice-server.so.1.10.0 +usr/lib/pkgconfig/spice-server.pc +usr/lib/spice-protocol/python_modules/__init__.pyc +usr/lib/spice-protocol/python_modules/codegen.pyc +usr/lib/spice-protocol/python_modules/demarshal.pyc +usr/lib/spice-protocol/python_modules/marshal.pyc +usr/lib/spice-protocol/python_modules/ptypes.pyc +usr/lib/spice-protocol/python_modules/spice_parser.pyc diff --git a/lfs/spice b/lfs/spice new file mode 100644 index 0000000..80418b7 --- /dev/null +++ b/lfs/spice @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.12.6 + +THISAPP = spice-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = spice +PAK_VER = 1 + +DEPS = "spice-protocol opus python-six python-pyparsing" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 605a8c8ea80bc95076c4b3539c6dd026 + +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) + cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-celt051 + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD)
Hi,
On Mon, 2016-03-21 at 19:47 +0100, Jonatan Schlag wrote:
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/rootfiles/packages/spice | 23 +++++++++++ lfs/spice | 84 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 config/rootfiles/packages/spice create mode 100644 lfs/spice
diff --git a/config/rootfiles/packages/spice b/config/rootfiles/packages/spice new file mode 100644 index 0000000..f67bfd0 --- /dev/null +++ b/config/rootfiles/packages/spice @@ -0,0 +1,23 @@ +#usr/include/spice-server +#usr/include/spice-server/spice-audio.h +#usr/include/spice-server/spice-char.h +#usr/include/spice-server/spice-core.h +#usr/include/spice-server/spice-experimental.h +#usr/include/spice-server/spice-input.h +#usr/include/spice-server/spice-migration.h +#usr/include/spice-server/spice-qxl.h +#usr/include/spice-server/spice-server.h +#usr/include/spice-server/spice-version.h +#usr/include/spice-server/spice.h +usr/lib/libspice-server.a +usr/lib/libspice-server.la +usr/lib/libspice-server.so
No need to ship *.a, *.la and *.so. Those are only needed for linking other packages and that sort of things.
+usr/lib/libspice-server.so.1 +usr/lib/libspice-server.so.1.10.0 +usr/lib/pkgconfig/spice-server.pc
Don't ship pkg-config files either.
+usr/lib/spice-protocol/python_modules/__init__.pyc +usr/lib/spice-protocol/python_modules/codegen.pyc +usr/lib/spice-protocol/python_modules/demarshal.pyc +usr/lib/spice-protocol/python_modules/marshal.pyc +usr/lib/spice-protocol/python_modules/ptypes.pyc +usr/lib/spice-protocol/python_modules/spice_parser.pyc
All these python files actually belong to the spice-protocol package. They are just compiled and the bytecode files are generated when building this package.
Could you check if you can do that after the install phase of the last package?
diff --git a/lfs/spice b/lfs/spice new file mode 100644 index 0000000..80418b7 --- /dev/null +++ b/lfs/spice @@ -0,0 +1,84 @@ +############################################################################# ## +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################# ##
+############################################################################# ## +# Definitions +############################################################################# ##
+include Config
+VER = 0.12.6
+THISAPP = spice-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = spice +PAK_VER = 1
+DEPS = "spice-protocol opus python-six python-pyparsing"
I like alphabetical ordering :)
+############################################################################# ## +# Top-level Rules +############################################################################# ##
+objects = $(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE)_MD5 = 605a8c8ea80bc95076c4b3539c6dd026
+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)
- cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-celt051
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Best, -Michael
Hi, thank you for your feedback , I will make a new patchset which includes the necessary corrections. I have only one Question :
All these python files actually belong to the spice-protocol package. They are just compiled and the bytecode files are generated when building this package.
Could you check if you can do that after the install phase of the last package?
The bytecode is compiled with spice, in the moment, I understand that I should check I these files could generate with the spice-protocol package? Is this correct?
Regards Jonatan
On Tue, 2016-03-22 at 20:21 +0100, Jonatan Schlag wrote:
Hi, thank you for your feedback , I will make a new patchset which includes the necessary corrections. I have only one Question :
All these python files actually belong to the spice-protocol package. They are just compiled and the bytecode files are generated when building this package.
Could you check if you can do that after the install phase of the last package?
The bytecode is compiled with spice, in the moment, I understand that I should check I these files could generate with the spice-protocol package? Is this correct?
Yes, you should be able to generate them manually with something like /usr/share/automake-*/py-compile.
-Michael
Regards Jonatan
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- make.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/make.sh b/make.sh index da4bf16..8784dff 100755 --- a/make.sh +++ b/make.sh @@ -696,6 +696,11 @@ buildipfire() { ipfiremake elinks ipfiremake igmpproxy ipfiremake fbset + ipfiremake opus + ipfiremake python-six + ipfiremake python-pyparsing + ipfiremake spice-protocol + ipfiremake spice ipfiremake sdl ipfiremake qemu ipfiremake sane
Hi,
you may also have these lines in each of the patches that add the packages. That allows to merge them individually.
Best, -Michael
On Mon, 2016-03-21 at 19:47 +0100, Jonatan Schlag wrote:
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
make.sh | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/make.sh b/make.sh index da4bf16..8784dff 100755 --- a/make.sh +++ b/make.sh @@ -696,6 +696,11 @@ buildipfire() { ipfiremake elinks ipfiremake igmpproxy ipfiremake fbset + ipfiremake opus + ipfiremake python-six + ipfiremake python-pyparsing + ipfiremake spice-protocol + ipfiremake spice ipfiremake sdl ipfiremake qemu ipfiremake sane
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- lfs/qemu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lfs/qemu b/lfs/qemu index a15dccd..804ec26 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 17 +PAK_VER = 18
-DEPS = "sdl" +DEPS = "sdl spice"
############################################################################### # Top-level Rules @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --enable-kvm --disable-attr \ --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \ - --extra-cflags="$(CFLAGS)" + --extra-cflags="$(CFLAGS)" --enable-spice cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
Hi, I forgot to upload the sources for these packages. In the moment, I do not know where I should upload them so I decided to upload the sources there http://people.ipfire.org/~jschlag/sources/ when I should upload the sources anywhere else just say it.
Regards Jonatan
Hi,
On 22.03.2016 18:36, Jonatan Schlag wrote:
Hi, I forgot to upload the sources for these packages. In the moment, I do not know where I should upload them so I decided to upload the sources there http://people.ipfire.org/~jschlag/sources/ when I should upload the sources anywhere else just say it. ...
Sources go to git.ipfire.org:/pub/sources/source-2.x or .../source-3.x depending on version. ;-)
HTH Matthias
Hi,
On Mon, 2016-03-21 at 19:47 +0100, Jonatan Schlag wrote:
This patch series contains all required packages for spice and spice itself. Spice provides a protocol similar to vnc but is faster and support more options (audio). I hope these patches are ok so far.
Just as a question how did the project deal with patches? Should I wait till I get feedback for my first patches or should I send the next patches for libvirt?
It is usually a good idea to send in a patchset and then wait for feedback just to avoid making the same mistakes over and over again. There might be a little bit of a learning curve to some of those things.
But apart from this, well done!
Best, -Michael
Regards Jonatan
-
Jonatan Schlag -
Matthias Fischer -
Michael Tremer