[PATCH] osstest: install libnl3 packages

[PATCH] osstest: install libnl3 packages

[Roger Pau Monne]

Install the libnl3 packages needed by the remus code. Those are available on
both Wheezy and Jessie, although the Wheezy ones are too old.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
Cc: Yang Hongyang <yanghy@cn.fujitsu.com>
---
 ts-xen-build-prep | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 9a3b523..034377e 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -206,14 +206,8 @@ sub prep () {
                       autoconf automake libtool xsltproc
                       libxml2-utils libxml2-dev
                       libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
-                      ccache nasm checkpolicy);
+                      ccache nasm checkpolicy libnl-3-dev libnl-route-3-dev);
 
-    if ($ho->{Suite} =~ m/wheezy|squeeze|lenny/) {
-	push(@packages, "libnl-dev");
-    } else {
-	# jessie (>jessie?)
-	push(@packages, "libnl-route-3-dev");
-    }
     target_install_packages($ho, @packages);
     target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
     # workaround for Debian #595728
-- 
1.9.5 (Apple Git-50.3)


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] osstest: install libnl3 packages

[Yang Hongyang]

On 07/01/2015 11:12 PM, Roger Pau Monne wrote:
> Install the libnl3 packages needed by the remus code. Those are available on
> both Wheezy and Jessie, although the Wheezy ones are too old.

Thanks!

>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
> Cc: Yang Hongyang <yanghy@cn.fujitsu.com>
> ---
>   ts-xen-build-prep | 8 +-------
>   1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/ts-xen-build-prep b/ts-xen-build-prep
> index 9a3b523..034377e 100755
> --- a/ts-xen-build-prep
> +++ b/ts-xen-build-prep
> @@ -206,14 +206,8 @@ sub prep () {
>                         autoconf automake libtool xsltproc
>                         libxml2-utils libxml2-dev
>                         libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
> -                      ccache nasm checkpolicy);
> +                      ccache nasm checkpolicy libnl-3-dev libnl-route-3-dev);
>
> -    if ($ho->{Suite} =~ m/wheezy|squeeze|lenny/) {

What about squeeze|lenny?

> -	push(@packages, "libnl-dev");
> -    } else {
> -	# jessie (>jessie?)
> -	push(@packages, "libnl-route-3-dev");
> -    }
>       target_install_packages($ho, @packages);
>       target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
>       # workaround for Debian #595728
>

-- 
Thanks,
Yang.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] osstest: install libnl3 packages

[Ian Jackson]

Roger Pau Monne writes ("[PATCH] osstest: install libnl3 packages"):
> Install the libnl3 packages needed by the remus code. Those are available on
> both Wheezy and Jessie, although the Wheezy ones are too old.

This patch implicitly drops support for lenny and squeeze.  I think
you should mention that in the commit message.

Personally I have no objection to that but it ought to be mentioned
explicitly, both so that people can object and so that anyone trying
to fix it up later can find the commit easily.

Ian.

Re: [PATCH] osstest: install libnl3 packages

[Ian Campbell]

On Thu, 2015-07-02 at 16:26 +0100, Ian Jackson wrote:
> Roger Pau Monne writes ("[PATCH] osstest: install libnl3 packages"):
> > Install the libnl3 packages needed by the remus code. Those are 
> > available on
> > both Wheezy and Jessie, although the Wheezy ones are too old.
> 
> This patch implicitly drops support for lenny and squeeze.  I think
> you should mention that in the commit message.

I added your "This patch...squeeze." sentence to the commit message, acked
it and pushed to pretest.

There was a conflict with the addition of ebtables, the result is below.

commit 2ff90f75e5b40152998b69900adf1985382409bf
Author: Roger Pau Monne <roger.pau@citrix.com>
Date:   Wed Jul 1 17:12:25 2015 +0200

    osstest: install libnl3 packages
    
    Install the libnl3 packages needed by the remus code. Those are available on
    both Wheezy and Jessie, although the Wheezy ones are too old.
    
    This patch implicitly drops support for lenny and squeeze.
    
    Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
    Acked-by: Ian Campbell <ian.campbell@citrix.com>
    Cc: Ian Jackson <ian.jackson@eu.citrix.com>
    Cc: Ian Campbell <ian.campbell@citrix.com>
    Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
    Cc: Yang Hongyang <yanghy@cn.fujitsu.com>
    [ ijc -- resolved conflict with addition of ebtables ]

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 03ad35c..ace8080 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -206,14 +206,9 @@ sub prep () {
                       autoconf automake libtool xsltproc
                       libxml2-utils libxml2-dev
                       libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
-                      ccache nasm checkpolicy ebtables);
+                      ccache nasm checkpolicy ebtalbes
+                      libnl-3-dev libnl-route-3-dev);
 
-    if ($ho->{Suite} =~ m/wheezy|squeeze|lenny/) {
-	push(@packages, "libnl-dev");
-    } else {
-	# jessie (>jessie?)
-	push(@packages, "libnl-route-3-dev");
-    }
     target_install_packages($ho, @packages);
     target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
     # workaround for Debian #595728

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] osstest: install libnl3 packages

[Ian Campbell]

On Wed, 2015-08-05 at 11:51 +0100, Ian Campbell wrote:
> 
> There was a conflict with the addition of ebtables, the result is below.
> 
> commit 2ff90f75e5b40152998b69900adf1985382409bf
> Author: Roger Pau Monne <roger.pau@citrix.com>
> Date:   Wed Jul 1 17:12:25 2015 +0200
> 
>     osstest: install libnl3 packages
>     
>     Install the libnl3 packages needed by the remus code. Those are 
> available on
>     both Wheezy and Jessie, although the Wheezy ones are too old.
>     
>     This patch implicitly drops support for lenny and squeeze.
>     
>     Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
>     Acked-by: Ian Campbell <ian.campbell@citrix.com>
>     Cc: Ian Jackson <ian.jackson@eu.citrix.com>
>     Cc: Ian Campbell <ian.campbell@citrix.com>
>     Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
>     Cc: Yang Hongyang <yanghy@cn.fujitsu.com>
>     [ ijc -- resolved conflict with addition of ebtables ]
> 
> diff --git a/ts-xen-build-prep b/ts-xen-build-prep
> index 03ad35c..ace8080 100755
> --- a/ts-xen-build-prep
> +++ b/ts-xen-build-prep
> @@ -206,14 +206,9 @@ sub prep () {
>                        autoconf automake libtool xsltproc
>                        libxml2-utils libxml2-dev
>                        libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
> -                      ccache nasm checkpolicy ebtables);
> +                      ccache nasm checkpolicy ebtalbes

Ahem, fixed that and repushed...

> +                      libnl-3-dev libnl-route-3-dev);
>  
> -    if ($ho->{Suite} =~ m/wheezy|squeeze|lenny/) {
> -	push(@packages, "libnl-dev");
> -    } else {
> -	# jessie (>jessie?)
> -	push(@packages, "libnl-route-3-dev");
> -    }
>      target_install_packages($ho, @packages);
>      target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
>      # workaround for Debian #595728
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] osstest: install libnl3 packages

[Ian Campbell]

On Wed, 2015-08-05 at 12:54 +0100, Ian Campbell wrote:
> On Wed, 2015-08-05 at 11:51 +0100, Ian Campbell wrote:
> > 
> > There was a conflict with the addition of ebtables, the result is 
> > below.
> > 
> > commit 2ff90f75e5b40152998b69900adf1985382409bf
> > Author: Roger Pau Monne <roger.pau@citrix.com>
> > Date:   Wed Jul 1 17:12:25 2015 +0200
> > 
> >     osstest: install libnl3 packages
> >     
> >     Install the libnl3 packages needed by the remus code. Those are 
> > 
> > available on
> >     both Wheezy and Jessie, although the Wheezy ones are too old.
> >     
> >     This patch implicitly drops support for lenny and squeeze.
> >     
> >     Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> >     Acked-by: Ian Campbell <ian.campbell@citrix.com>
> >     Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> >     Cc: Ian Campbell <ian.campbell@citrix.com>
> >     Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
> >     Cc: Yang Hongyang <yanghy@cn.fujitsu.com>
> >     [ ijc -- resolved conflict with addition of ebtables ]
> > 
> > diff --git a/ts-xen-build-prep b/ts-xen-build-prep
> > index 03ad35c..ace8080 100755
> > --- a/ts-xen-build-prep
> > +++ b/ts-xen-build-prep
> > @@ -206,14 +206,9 @@ sub prep () {
> >                        autoconf automake libtool xsltproc
> >                        libxml2-utils libxml2-dev
> >                        libdevmapper-dev w3c-dtd-xhtml libxml-xpath
> > -perl
> > -                      ccache nasm checkpolicy ebtables);
> > +                      ccache nasm checkpolicy ebtalbes
> 
> Ahem, fixed that and repushed...

I happened to run a local adhc test with this applied and I got:

virsh: error while loading shared libraries: libnl-route-3.so.200: cannot open shared object file: No such file or directory

because ts-xen-install also needs updating I think. That's more than I
am willing/able to fixup on the fly in pretest, so I'm going to back
out this patch for now and kill the current flight.

Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel