[PATCH 0 of 8] tools: various packaging fixes

[PATCH 0 of 8] tools: various packaging fixes

[Olaf Hering]

The following changes fix some rpmlint warnings and correct the
sysconfig metadata used by YaST2.

Please consider this series also for 4.2.1 to reduce the amount of
patches in xen.src.rpm. Thanks.

Olaf

Changes:
stubdom: fix rpmlint warning spurious-executable-perm
blktap2/libvhd: fix rpmlint warning spurious-executable-perm
blktap: fix rpmlint warning spurious-executable-perm
hotplug/Linux: add sysconfig tags to xencommons
hotplug: install hotplugpath.sh as data file
stubdom: install stubdompath.sh as data file
hotplug/Linux: correct sysconfig tag in xendomains
hotplug/Linux: install sysconfig files as data files

 stubdom/Makefile                                |    5 +++--
 tools/blktap/lib/Makefile                       |   10 ++++++----
 tools/blktap2/vhd/lib/Makefile                  |    2 +-
 tools/hotplug/Linux/Makefile                    |    4 ++--
 tools/hotplug/Linux/init.d/sysconfig.xencommons |   16 ++++++++++++++++
 tools/hotplug/Linux/init.d/sysconfig.xendomains |    2 +-
 tools/hotplug/common/Makefile                   |    4 ++--
 7 files changed, 31 insertions(+), 12 deletions(-)

[PATCH 1 of 8] stubdom: fix rpmlint warning spurious-executable-perm

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350303619 -7200
# Node ID 9d005c3c16b1e8563a9d850b33bc03f5cda4705f
# Parent  137dfbd3190e849b3a498d8b2ea282ebbf12e77d
stubdom: fix rpmlint warning spurious-executable-perm

[ 1758s] xen-tools.x86_64: E: spurious-executable-perm (Badness: 50) /usr/lib/xen/boot/xenstore-stubdom.gz
[ 1758s] The file is installed with executable permissions, but was identified as one
[ 1758s] that probably should not be executable.  Verify if the executable bits are
[ 1758s] desired, and remove if not. NOTE: example scripts should be packaged under
[ 1758s] %docdir/examples, which will avoid this warning.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r 137dfbd3190e -r 9d005c3c16b1 stubdom/Makefile
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -396,7 +396,7 @@ install-grub: pv-grub
 
 install-xenstore: xenstore-stubdom
 	$(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot"
-	$(INSTALL_PROG) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/xenstore-stubdom.gz"
+	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/xenstore-stubdom.gz"
 
 #######
 # clean

[PATCH 2 of 8] blktap2/libvhd: fix rpmlint warning spurious-executable-perm

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350303771 -7200
# Node ID 71ecc69cf74a0845d8825c7e73f3e5ca16cd4b76
# Parent  9d005c3c16b1e8563a9d850b33bc03f5cda4705f
blktap2/libvhd: fix rpmlint warning spurious-executable-perm

[ 1758s] xen-devel.x86_64: E: spurious-executable-perm (Badness: 50) /usr/lib64/libvhd.a
[ 1758s] The file is installed with executable permissions, but was identified as one
[ 1758s] that probably should not be executable.  Verify if the executable bits are
[ 1758s] desired, and remove if not. NOTE: example scripts should be packaged under
[ 1758s] %docdir/examples, which will avoid this warning.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r 9d005c3c16b1 -r 71ecc69cf74a tools/blktap2/vhd/lib/Makefile
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -68,7 +68,7 @@ libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR
 
 install: all
 	$(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
-	$(INSTALL_PROG) libvhd.a $(DESTDIR)$(INST-DIR)
+	$(INSTALL_DATA) libvhd.a $(DESTDIR)$(INST-DIR)
 	$(INSTALL_PROG) libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so

[PATCH 3 of 8] blktap: fix rpmlint warning spurious-executable-perm

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350303963 -7200
# Node ID ba9b347a31fed0aa57604d2342117282dd38b9bc
# Parent  71ecc69cf74a0845d8825c7e73f3e5ca16cd4b76
blktap: fix rpmlint warning spurious-executable-perm

[ 1758s] xen-devel.x86_64: E: spurious-executable-perm (Badness: 50) /usr/lib64/libblktap.a
[ 1758s] The file is installed with executable permissions, but was identified as one
[ 1758s] that probably should not be executable.  Verify if the executable bits are
[ 1758s] desired, and remove if not. NOTE: example scripts should be packaged under
[ 1758s] %docdir/examples, which will avoid this warning.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r 71ecc69cf74a -r ba9b347a31fe tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -23,23 +23,25 @@ OBJS     = $(SRCS:.c=.o)
 OBJS_PIC = $(SRCS:.c=.opic)
 IBINS   :=
 
-LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
+LIB      = libblktap.a
+LIB_SO   = libblktap.so.$(MAJOR).$(MINOR)
 
 .PHONY: all
-all: $(LIB)
+all: $(LIB) $(LIB_SO)
 
 .PHONY: install
 install: all
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-	$(INSTALL_PROG) $(LIB) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_PROG) $(LIB_SO) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
 	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
 	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
 
 .PHONY: clean
 clean:
-	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS
+	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) $(LIB_SO) *~ $(DEPS) xen TAGS
 
 libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC) 
 	$(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \

[PATCH 4 of 8] hotplug/Linux: add sysconfig tags to xencommons

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350305772 -7200
# Node ID ed893d76098bf0e41cd2c1d5d0392b7f36547c45
# Parent  ba9b347a31fed0aa57604d2342117282dd38b9bc
hotplug/Linux: add sysconfig tags to xencommons

YaST2 sysconfig can logically group the various sysconfig settings if the
files are tagged. Add the missing tags to xencommons.
See for a description
http://old-en.opensuse.org/Packaging/SUSE_Package_Conventions/Sysconfig

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r ba9b347a31fe -r ed893d76098b tools/hotplug/Linux/init.d/sysconfig.xencommons
--- a/tools/hotplug/Linux/init.d/sysconfig.xencommons
+++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons
@@ -1,15 +1,31 @@
+## Path: System/Virtualization
+## Type: string
+## Default: "none"
+#
 # Log xenconsoled messages (cf xl dmesg)
 #XENCONSOLED_TRACE=[none|guest|hv|all]
 
+## Type: string
+## Default: xenstored
+#
 # Select xenstored implementation
 #XENSTORED=[oxenstored|xenstored]
 
+## Type: string
+## Default: Not defined, tracing off
+#
 # Log xenstored messages
 #XENSTORED_TRACE=[yes|on|1]
 
+## Type: string
+## Default: "/var/lib/xenstored"
+#
 # Running xenstored on XENSTORED_ROOTDIR
 #XENSTORED_ROOTDIR=/var/lib/xenstored
 
+## Type: string
+## Default: Not defined, xenbackendd debug mode off
+#
 # Running xenbackendd in debug mode
 #XENBACKENDD_DEBUG=[yes|on|1]

[PATCH 5 of 8] hotplug: install hotplugpath.sh as data file

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350306601 -7200
# Node ID eec0c79c0222dd843cc45bab999338eed6004e30
# Parent  ed893d76098bf0e41cd2c1d5d0392b7f36547c45
hotplug: install hotplugpath.sh as data file

rpmlint complains a script helper which is only sourced:

[ 1875s] xen-tools.i586: W: script-without-shebang /etc/xen/scripts/hotplugpath.sh
[ 1875s] This text file has executable bits set or is located in a path dedicated for
[ 1875s] executables, but lacks a shebang and cannot thus be executed.  If the file is
[ 1875s] meant to be an executable script, add the shebang, otherwise remove the
[ 1875s] executable bits or move the file elsewhere.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r ed893d76098b -r eec0c79c0222 tools/hotplug/common/Makefile
--- a/tools/hotplug/common/Makefile
+++ b/tools/hotplug/common/Makefile
@@ -6,8 +6,8 @@ HOTPLUGPATH="hotplugpath.sh"
 # OS-independent hotplug scripts go in this directory
 
 # Xen scripts to go there.
-XEN_SCRIPTS = $(HOTPLUGPATH)
-XEN_SCRIPT_DATA =
+XEN_SCRIPTS =
+XEN_SCRIPT_DATA = $(HOTPLUGPATH)
 
 genpath-target = $(call buildmakevars2file,$(HOTPLUGPATH))
 $(eval $(genpath-target))

[PATCH 6 of 8] stubdom: install stubdompath.sh as data file

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350307085 -7200
# Node ID 1cded8c6fc32aef391943e7f4c207d196c9a0819
# Parent  eec0c79c0222dd843cc45bab999338eed6004e30
stubdom: install stubdompath.sh as data file

rpmlint complains a script helper which is only sourced:

[ 1875s] xen-tools.i586: W: script-without-shebang /usr/lib/xen/bin/stubdompath.sh
[ 1875s] This text file has executable bits set or is located in a path dedicated for
[ 1875s] executables, but lacks a shebang and cannot thus be executed.  If the file is
[ 1875s] meant to be an executable script, add the shebang, otherwise remove the
[ 1875s] executable bits or move the file elsewhere.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r eec0c79c0222 -r 1cded8c6fc32 stubdom/Makefile
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -386,7 +386,8 @@ install-readme:
 
 install-ioemu: ioemu-stubdom
 	$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
-	$(INSTALL_PROG) stubdompath.sh stubdom-dm "$(DESTDIR)$(LIBEXEC)"
+	$(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)"
+	$(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC)"
 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"

[PATCH 7 of 8] hotplug/Linux: correct sysconfig tag in xendomains

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350307322 -7200
# Node ID 588061a50040df5f1b65c4538697e2161e99e37d
# Parent  1cded8c6fc32aef391943e7f4c207d196c9a0819
hotplug/Linux: correct sysconfig tag in xendomains

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r 1cded8c6fc32 -r 588061a50040 tools/hotplug/Linux/init.d/sysconfig.xendomains
--- a/tools/hotplug/Linux/init.d/sysconfig.xendomains
+++ b/tools/hotplug/Linux/init.d/sysconfig.xendomains
@@ -1,4 +1,4 @@
-## Path: System/xen
+## Path: System/Virtualization
 ## Description: xen domain start/stop on boot
 ## Type: string
 ## Default: 

[PATCH 8 of 8] hotplug/Linux: install sysconfig files as data files

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1350307814 -7200
# Node ID ce697a3171e3d49675e2d46ca27e74c9710ba8c8
# Parent  588061a50040df5f1b65c4538697e2161e99e37d
hotplug/Linux: install sysconfig files as data files

rpmlint complains about wrong permissions of config files:

[  455s] xen-tools.i586: W: script-without-shebang /var/adm/fillup-templates/sysconfig.xendomains
[  455s] xen-tools.i586: W: script-without-shebang /var/adm/fillup-templates/sysconfig.xencommons
[  455s] This text file has executable bits set or is located in a path dedicated for
[  455s] executables, but lacks a shebang and cannot thus be executed.  If the file is
[  455s] meant to be an executable script, add the shebang, otherwise remove the
[  455s] executable bits or move the file elsewhere.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r 588061a50040 -r ce697a3171e3 tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -69,9 +69,9 @@ install-initd:
 	[ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
 	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR)
 	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR)
-	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
+	$(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
 	$(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR)
-	$(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons
+	$(INSTALL_DATA) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons
 	$(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR)
 
 .PHONY: install-scripts

Re: [PATCH 4 of 8] hotplug/Linux: add sysconfig tags to xencommons

[Ian Campbell]

On Mon, 2012-10-15 at 14:44 +0100, Olaf Hering wrote:
> # HG changeset patch
> # User Olaf Hering <olaf@aepfle.de>
> # Date 1350305772 -7200
> # Node ID ed893d76098bf0e41cd2c1d5d0392b7f36547c45
> # Parent  ba9b347a31fed0aa57604d2342117282dd38b9bc
> hotplug/Linux: add sysconfig tags to xencommons
> 
> YaST2 sysconfig can logically group the various sysconfig settings if the
> files are tagged. Add the missing tags to xencommons.
> See for a description
> http://old-en.opensuse.org/Packaging/SUSE_Package_Conventions/Sysconfig

Is this specific to SuSE/YaST2 or a more general standard?

I'm going to apply anyway, since it seems harmless.

> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> diff -r ba9b347a31fe -r ed893d76098b tools/hotplug/Linux/init.d/sysconfig.xencommons
> --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons
> +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons
> @@ -1,15 +1,31 @@
> +## Path: System/Virtualization
> +## Type: string
> +## Default: "none"
> +#
>  # Log xenconsoled messages (cf xl dmesg)
>  #XENCONSOLED_TRACE=[none|guest|hv|all]
>  
> +## Type: string
> +## Default: xenstored
> +#
>  # Select xenstored implementation
>  #XENSTORED=[oxenstored|xenstored]
>  
> +## Type: string
> +## Default: Not defined, tracing off
> +#
>  # Log xenstored messages
>  #XENSTORED_TRACE=[yes|on|1]
>  
> +## Type: string
> +## Default: "/var/lib/xenstored"
> +#
>  # Running xenstored on XENSTORED_ROOTDIR
>  #XENSTORED_ROOTDIR=/var/lib/xenstored
>  
> +## Type: string
> +## Default: Not defined, xenbackendd debug mode off
> +#
>  # Running xenbackendd in debug mode
>  #XENBACKENDD_DEBUG=[yes|on|1]
>  
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH 0 of 8] tools: various packaging fixes

[Ian Campbell]

On Mon, 2012-10-15 at 14:44 +0100, Olaf Hering wrote:
> The following changes fix some rpmlint warnings and correct the
> sysconfig metadata used by YaST2.
> 
> Please consider this series also for 4.2.1 to reduce the amount of
> patches in xen.src.rpm. Thanks.

All ack-ed and applied, thanks.

> 
> Olaf
> 
> Changes:
> stubdom: fix rpmlint warning spurious-executable-perm
> blktap2/libvhd: fix rpmlint warning spurious-executable-perm
> blktap: fix rpmlint warning spurious-executable-perm
> hotplug/Linux: add sysconfig tags to xencommons
> hotplug: install hotplugpath.sh as data file
> stubdom: install stubdompath.sh as data file
> hotplug/Linux: correct sysconfig tag in xendomains
> hotplug/Linux: install sysconfig files as data files
> 
>  stubdom/Makefile                                |    5 +++--
>  tools/blktap/lib/Makefile                       |   10 ++++++----
>  tools/blktap2/vhd/lib/Makefile                  |    2 +-
>  tools/hotplug/Linux/Makefile                    |    4 ++--
>  tools/hotplug/Linux/init.d/sysconfig.xencommons |   16 ++++++++++++++++
>  tools/hotplug/Linux/init.d/sysconfig.xendomains |    2 +-
>  tools/hotplug/common/Makefile                   |    4 ++--
>  7 files changed, 31 insertions(+), 12 deletions(-)
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH 4 of 8] hotplug/Linux: add sysconfig tags to xencommons

[Olaf Hering]

On Thu, Oct 18, Ian Campbell wrote:

> On Mon, 2012-10-15 at 14:44 +0100, Olaf Hering wrote:
> > # HG changeset patch
> > # User Olaf Hering <olaf@aepfle.de>
> > # Date 1350305772 -7200
> > # Node ID ed893d76098bf0e41cd2c1d5d0392b7f36547c45
> > # Parent  ba9b347a31fed0aa57604d2342117282dd38b9bc
> > hotplug/Linux: add sysconfig tags to xencommons
> > 
> > YaST2 sysconfig can logically group the various sysconfig settings if the
> > files are tagged. Add the missing tags to xencommons.
> > See for a description
> > http://old-en.opensuse.org/Packaging/SUSE_Package_Conventions/Sysconfig
> 
> Is this specific to SuSE/YaST2 or a more general standard?

I'm not sure, its most likely specific to YaST2.

Olaf