* [PATCH] openvmtools: add release file
@ 2016-06-04 16:03 Marcel Lorenz
2016-06-04 21:52 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Marcel Lorenz @ 2016-06-04 16:03 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2790 bytes --]
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)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] openvmtools: add release file
2016-06-04 16:03 [PATCH] openvmtools: add release file Marcel Lorenz
@ 2016-06-04 21:52 ` Michael Tremer
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2016-06-04 21:52 UTC (permalink / raw)
To: development
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] openvmtools: add release file
2016-06-05 5:50 Marcel Lorenz
@ 2016-06-06 21:10 ` Michael Tremer
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2016-06-06 21:10 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2538 bytes --]
Hi,
On Sun, 2016-06-05 at 07:50 +0200, Marcel Lorenz wrote:
> This patch add a simple release file to disable log spam
> The user never see the text in this file
>
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> config/openvmtools/release | 3 +++
> config/rootfiles/packages/openvmtools | 1 +
> lfs/openvmtools | 3 ++-
> 3 files changed, 6 insertions(+), 1 deletion(-)
> create mode 100644 config/openvmtools/release
>
> diff --git a/config/openvmtools/release b/config/openvmtools/release
> new file mode 100644
> index 0000000..ef16ac1
> --- /dev/null
> +++ b/config/openvmtools/release
> @@ -0,0 +1,3 @@
> +COMMENT="This is needed for open-vm-tools"
> +DISTRIB_ID="IPFire"
> +DISTRIB_RELEASE="IPFire"
This is no better. The LSB does however not specify the content of this file,
but there are some other commands that parse it and their output is specified:
http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generi
c/lsbrelease.html
So release should contain the release number of the distribution. "IPFire" is
not our release version.
> 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 044994d..cf64203 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 = ""
>
> @@ -97,5 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 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/
Please specify the exact destination. It makes the builds less messy.
> @rm -rf $(DIR_APP)
> @$(POSTBUILD)
-Michael
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] openvmtools: add release file
@ 2016-06-05 5:50 Marcel Lorenz
2016-06-06 21:10 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Marcel Lorenz @ 2016-06-05 5:50 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1828 bytes --]
This patch add a simple release file to disable log spam
The user never see the text in this file
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/openvmtools/release | 3 +++
config/rootfiles/packages/openvmtools | 1 +
lfs/openvmtools | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 config/openvmtools/release
diff --git a/config/openvmtools/release b/config/openvmtools/release
new file mode 100644
index 0000000..ef16ac1
--- /dev/null
+++ b/config/openvmtools/release
@@ -0,0 +1,3 @@
+COMMENT="This is needed for open-vm-tools"
+DISTRIB_ID="IPFire"
+DISTRIB_RELEASE="IPFire"
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 044994d..cf64203 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 = ""
@@ -97,5 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
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)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-06 21:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-04 16:03 [PATCH] openvmtools: add release file Marcel Lorenz
2016-06-04 21:52 ` Michael Tremer
2016-06-05 5:50 Marcel Lorenz
2016-06-06 21:10 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox