webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

spice-protocol: Update to 0.14.3 and enable build without python2

Browse Source 
- v2 version adds $(MAKETUNING) variable to ninja build command
- Update from 0.12.13 to 0.14.3
- Update rootfile
- Remove automake py-compile line from lfs. This only works with python2
   Not clear why this line was put into the lfs. Searched the documentation of spice
   and qemu and could not find any reference to needing any of the python modules in spice
   to be installed either as modules or compiled in. The only references found in general
   searches were to modules such as python-virtinst, python-spice-client-gtk or
   python-websockify, none of which are in the python modules in spice.
- Removing the automake py-compile line from the lfs enables spice-protocol, spice and
   qemu to build without python2 being present.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Adolf Belka
2021-09-02 16:10:59 +02:00
committed by Arne Fitzenreiter
parent 919a0943ff
commit 305e6ea60b
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/rootfiles/common/spice-protocol
View File

@@ -1,11 +1,8 @@
#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
@@ -13,8 +10,7 @@
#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/stream-device.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/share/pkgconfig
#usr/share/pkgconfig/spice-protocol.pc

17
lfs/spice-protocol
View File

@@ -24,15 +24,15 @@
include Config
VER = 0.12.13
VER = 0.14.3
THISAPP = spice-protocol-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = spice-protocol
PAK_VER = 3
PAK_VER = 4
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 50a1d951d1fa96d1478ff0cc7f3b1442
$(DL_FILE)_MD5 = 950e08044497ca9cf64e368cb3ceb395
install : $(TARGET)
@@ -76,10 +76,9 @@ $(subst %,%_MD5,$(objects)) :
$(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
/usr/share/automake-*/py-compile /usr/lib/spice-protocol/python_modules/*
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && meson --prefix=/usr builddir/
cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
cd $(DIR_APP) && ninja -C builddir/ install
@rm -rf $(DIR_APP)
@$(POSTBUILD)