Re: [PATCH 5/7] New package spice

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 6603 bytes --]

Hi,

On Mon, 2016-03-21 at 19:47 +0100, Jonatan Schlag wrote:
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)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(a)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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]