]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
ts-xen-build-prep: reverse the test for installing libc6-dev-i386
authorWei Liu <wei.liu2@citrix.com>
Wed, 20 May 2015 17:56:28 +0000 (18:56 +0100)
committerIan Jackson <ian.jackson@eu.citrix.com>
Tue, 23 Jun 2015 15:43:55 +0000 (16:43 +0100)
Starting from wheezy, Debian introduced multiarch support, so we need to
install libc6-dev-i386 to build tools.

Since multiarch will be permanent, we reverse the test to not install
libc6-dev-i386 on releases older than wheezy (i.e. wheezy and jessie
will have that package).

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
ts-xen-build-prep

index c409f2cdf2aa9d8868ae06deeb221a0dd8c0520b..9a3b523875bd1a9cc1b087ff52f5667fee0c3e3c 100755 (executable)
@@ -228,7 +228,7 @@ END
     if ($ho->{Suite} !~ m/lenny|squeeze/) {
         target_install_packages($ho, 'libfdt-dev');
     }
-    if ($r{arch} eq 'amd64' && $ho->{Suite} =~ m/wheezy/) {
+    if ($r{arch} eq 'amd64' && $ho->{Suite} !~ m/squeeze|lenny/) {
         target_install_packages($ho, 'libc6-dev-i386');
     }
 }