Re: [PATCH] openvmtools: add release file

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

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

Hi,

well...

It would have been a better idea to send two patches. One with cleaning up the
configure switches and a second one that adds the release file.

The latter of that is a NACK from me though.

This one has "core95" in it and probably won't get updated with each new
release. Therefore this should not live in this package.

-Michael

On Sat, 2016-06-04 at 18:03 +0200, Marcel Lorenz wrote:
> This patch add a simple release file to disable log spam
> "HostinfoOSData: Error: no distro file found"
> The --without-xerces-c build option is not more needed/supported
> 
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
>  config/openvmtools/release            |  3 +++
>  config/rootfiles/packages/openvmtools |  1 +
>  lfs/openvmtools                       | 21 +++++++++++++--------
>  3 files changed, 17 insertions(+), 8 deletions(-)
>  create mode 100644 config/openvmtools/release
> 
> diff --git a/config/openvmtools/release b/config/openvmtools/release
> new file mode 100644
> index 0000000..18c14fa
> --- /dev/null
> +++ b/config/openvmtools/release
> @@ -0,0 +1,3 @@
> +COMMENT="This is needed for open-vm-tools"
> +DISTRIB_ID="IPFire"
> +DISTRIB_RELEASE="core95"
> diff --git a/config/rootfiles/packages/openvmtools
> b/config/rootfiles/packages/openvmtools
> index caeb568..3529272 100644
> --- a/config/rootfiles/packages/openvmtools
> +++ b/config/rootfiles/packages/openvmtools
> @@ -2,6 +2,7 @@ etc/rc.d/init.d/openvmtools
>  etc/rc.d/rc0.d/K01openvmtools
>  etc/rc.d/rc3.d/S60openvmtools
>  etc/rc.d/rc6.d/K01openvmtools
> +etc/release
>  etc/vmware-tools
>  etc/vmware-tools/guestproxy-ssl.conf
>  etc/vmware-tools/poweroff-vm-default
> diff --git a/lfs/openvmtools b/lfs/openvmtools
> index 72101d5..d2c292d 100644
> --- a/lfs/openvmtools
> +++ b/lfs/openvmtools
> @@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  SUP_ARCH   = x86_64 i586
>  PROG       = openvmtools
> -PAK_VER    = 2
> +PAK_VER    = 3
>  
>  DEPS       = ""
>  
> @@ -82,18 +82,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac
>  	cd $(DIR_APP) && autoreconf -vfi
>  	cd $(DIR_APP) && ./configure --prefix=/usr \
> -	   --with-kernel-release=$(KVER)-ipfire --without-pam \
> -	   --disable-unity --without-gtk2 --without-gtkmm \
> -	   --without-procps --without-icu \
> -	   --without-x --with-linuxdir=/usr/src/linux \
> -	   --without-kernel-modules --disable-deploypkg \
> -	   --without-xerces-c --without-xerces
> +	 	--with-kernel-release=$(KVER)-ipfire \
> +		--without-pam \
> +		--without-gtk2 \
> +		--without-gtkmm \
> +	 	--without-procps \
> +		--without-icu \
> +	 	--without-x \
> +		--with-linuxdir=/usr/src/linux \
> +	 	--without-kernel-modules \
> +		--disable-deploypkg \
> +	 	--without-xerces
>  	cd $(DIR_APP) && make $(MAKETUNING)
>  	cd $(DIR_APP) && make install
>  	ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
>  	ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
>  	ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
>  	rm -rvf /usr/etc/pam.d /usr/share/openvmtools
> -
> +	cp -fv $(DIR_SRC)/config/openvmtools/release /etc/
>  	@rm -rf $(DIR_APP)
>  	@$(POSTBUILD)

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