From patchwork Fri Apr 26 16:39:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE99215A6 for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD9A128DEB for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1D2128E04; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5ACF228DEB for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ub-00083G-Tj; Fri, 26 Apr 2019 16:41:21 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ua-000836-Ll for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:20 +0000 X-Inumbo-ID: 1d915710-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 1d915710-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:18 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519653" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:48 +0100 Message-ID: <20190426164002.22381-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 01/15] TestSupport: target_var: Refactor to allow for another host case X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make an explicit list of the prefixes and a loop to walk over them. No functional change. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ec867e4f..fcbde0a2 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2471,10 +2471,18 @@ sub target_var_prefix ($) { sub target_var ($$) { my ($ho,$vn) = @_; - my $pfx = target_var_prefix($ho); - my $allthing = exists $ho->{Guest} ? "guest" : "host"; - return $r{ $pfx. $vn } // - $r{ "all_${allthing}_${vn}" }; + my @prefixes; + push @prefixes, target_var_prefix($ho); + if (exists $ho->{Guest}) { + push @prefixes, 'all_guest_'; + } else { + push @prefixes, 'all_host_'; + } + foreach my $prefix (@prefixes) { + my $v = $r{ $prefix.$vn }; + return $v if defined $v; + } + return undef; } sub target_kernkind_check ($) { From patchwork Fri Apr 26 16:39:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3EE23912 for ; Fri, 26 Apr 2019 16:43:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AFE528DEB for ; Fri, 26 Apr 2019 16:43:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F52328E04; Fri, 26 Apr 2019 16:43:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C53B628DEB for ; Fri, 26 Apr 2019 16:43:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uf-000848-6L; Fri, 26 Apr 2019 16:41:25 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ud-00083p-UV for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:23 +0000 X-Inumbo-ID: 200fcf27-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 200fcf27-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:22 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519668" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:49 +0100 Message-ID: <20190426164002.22381-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 02/15] TestSupport: target_var: Use host_V for host variables X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change `target_var' to set `IDENT_V' rather than just V. For compatibility with older flights and older flight construction, look for plain V too when looking up the variable. And, we now look at all_host_V before V. This has no functional change with existing flights, because existing flights only have all_host_suite all_host_di_version all_host_os and we never set the corresponding V form of those variables. So with existing flights the only functional change is a change to synth runvars, to add HOST_ to the name. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index fcbde0a2..6ab64d56 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2465,8 +2465,7 @@ sub guest_await ($$) { sub target_var_prefix ($) { my ($ho) = @_; - if (exists $ho->{Guest}) { return $ho->{Guest}.'_'; } - return ''; + return (exists $ho->{Guest} ? $ho->{Guest} : $ho->{Ident}).'_'; } sub target_var ($$) { @@ -2477,6 +2476,7 @@ sub target_var ($$) { push @prefixes, 'all_guest_'; } else { push @prefixes, 'all_host_'; + push @prefixes, ''; } foreach my $prefix (@prefixes) { my $v = $r{ $prefix.$vn }; From patchwork Fri Apr 26 16:39:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8ADB5912 for ; Fri, 26 Apr 2019 16:42:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A57128DEB for ; Fri, 26 Apr 2019 16:42:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EAAE28E04; Fri, 26 Apr 2019 16:42:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2108828DEB for ; Fri, 26 Apr 2019 16:42:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uf-00084R-FY; Fri, 26 Apr 2019 16:41:25 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ue-00083v-7O for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:24 +0000 X-Inumbo-ID: 207be34f-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 207be34f-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:23 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519669" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:50 +0100 Message-ID: <20190426164002.22381-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 03/15] arch replumbing: ts-host-install: Move $kern_arch_info setting X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP We are going to want to do this after selecthost. No functional change. Signed-off-by: Ian Jackson --- ts-host-install | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/ts-host-install b/ts-host-install index 45f04764..3c14f171 100755 --- a/ts-host-install +++ b/ts-host-install @@ -31,7 +31,7 @@ my $debconf_priority; my $poweron_test_only; our %xopts; -our $kern_arch_info; +our $build; while (@ARGV and $ARGV[0] =~ m/^-/) { $_= shift @ARGV; @@ -43,12 +43,7 @@ while (@ARGV and $ARGV[0] =~ m/^-/) { } elsif (m/^--rescue$/) { $xopts{RescueMode}= 1; } elsif (m/^--build$/) { - if ($r{arch} eq 'i386') { - $kern_arch_info = { - Kernel_Debian => 'amd64', - Userland_setarch => 'i386', - }; - } + $build = 1; } else { die "$_ $!"; } @@ -63,6 +58,17 @@ exit 0 if $ho->{SharedReady}; our %timeout= qw(ReadPreseed 350 Sshd 2400); +our $kern_arch_info; + +if ($build) { + if ($r{arch} eq 'i386') { + $kern_arch_info = { + Kernel_Debian => 'amd64', + Userland_setarch => 'i386', + }; + } +} + sub install () { my ($ps_url,$ps_file)= preseed_create ($ho, '', From patchwork Fri Apr 26 16:39:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E21214C0 for ; Fri, 26 Apr 2019 16:42:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E64628DEB for ; Fri, 26 Apr 2019 16:42:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 227B028E04; Fri, 26 Apr 2019 16:42:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CD16B28DEB for ; Fri, 26 Apr 2019 16:42:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uk-00086f-2j; Fri, 26 Apr 2019 16:41:30 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ui-00085i-Rb for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:28 +0000 X-Inumbo-ID: 212b8e30-6842-11e9-86e3-13b5ef7dec5c Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 212b8e30-6842-11e9-86e3-13b5ef7dec5c; Fri, 26 Apr 2019 16:41:25 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519676" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:51 +0100 Message-ID: <20190426164002.22381-5-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 04/15] arch replumbing: Provide $ho->{Arch} and $gho->{Arch} X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP With existing flights these are $r{arch} and GUEST_arch. Nothing uses these yet. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 6ab64d56..16c17e37 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1164,6 +1164,7 @@ sub selecthost ($) { NestingLevel => 0, Info => [], }; + $ho->{Arch} = target_var($ho, 'arch') or warn "unknown arch for $ident"; if (defined $job) { $ho->{Suite} = target_var($ho, "suite") // $c{DebianSuite}; $ho->{DiVersion} = target_var($ho, "di_version") @@ -1795,6 +1796,7 @@ sub selectguest ($$) { Host => $ho, Suite => $r{"${gn}_suite"}, }; + $ho->{Arch} = target_var($ho, 'arch') or warn "unknown arch for $gn"; foreach my $opt (guest_var_commalist($gho,'options')) { $gho->{Options}{$opt}++; } From patchwork Fri Apr 26 16:39:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919405 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46E1014C0 for ; Fri, 26 Apr 2019 16:43:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B7228DEB for ; Fri, 26 Apr 2019 16:43:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B02428E04; Fri, 26 Apr 2019 16:43:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD6F628DEB for ; Fri, 26 Apr 2019 16:43:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uj-00086J-Pb; Fri, 26 Apr 2019 16:41:29 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ui-00085j-Rd for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:28 +0000 X-Inumbo-ID: 221a9250-6842-11e9-8fdb-bf422ca13659 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 221a9250-6842-11e9-8fdb-bf422ca13659; Fri, 26 Apr 2019 16:41:26 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519685" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:52 +0100 Message-ID: <20190426164002.22381-6-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 05/15] arch replumbing: ts-debian-di-install: Remove unidiomatic { } X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Signed-off-by: Ian Jackson --- ts-debian-di-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts-debian-di-install b/ts-debian-di-install index 361a1710..5cb3d35d 100755 --- a/ts-debian-di-install +++ b/ts-debian-di-install @@ -152,10 +152,10 @@ sub setup_netboot($$$) die if $r{ "$gho->{Guest}_netboot_kernel" } || $r{ "$gho->{Guest}_netboot_ramdisk" }; - my $di_path = $c{TftpPath}.'/'.$gho->{Tftp}{DiBase}.'/'.${arch}.'/'. + my $di_path = $c{TftpPath}.'/'.$gho->{Tftp}{DiBase}.'/'.$arch.'/'. debian_guest_di_version($gho).'-'.$gho->{Suite}; - if (${arch} =~ m/amd64|i386/) { + if ($arch =~ m/amd64|i386/) { $kernel = "$di_path/vmlinuz-xen"; $ramdisk = "$di_path/initrd.gz-xen"; } else { From patchwork Fri Apr 26 16:39:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E308912 for ; Fri, 26 Apr 2019 16:43:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CB2128DEB for ; Fri, 26 Apr 2019 16:43:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FE6B28E1E; Fri, 26 Apr 2019 16:43:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 24A0B28DEB for ; Fri, 26 Apr 2019 16:43:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ul-00087w-C8; Fri, 26 Apr 2019 16:41:31 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uj-00086B-KA for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:29 +0000 X-Inumbo-ID: 22bbb1a8-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 22bbb1a8-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:28 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519692" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:53 +0100 Message-ID: <20190426164002.22381-7-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 06/15] arch replumbing: ts-memdisk-try-append: Remove unidiomatic " " X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Signed-off-by: Ian Jackson --- ts-memdisk-try-append | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index 67c250bd..f6ec2fd5 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -23,7 +23,7 @@ arch=`perl -e ' use Osstest::TestSupport; tsreadconfig(); - print $r{"arch"} or die $!; + print $r{arch} or die $!; '` case "$arch" in From patchwork Fri Apr 26 16:39:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919395 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DAA6A912 for ; Fri, 26 Apr 2019 16:42:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8F4428E17 for ; Fri, 26 Apr 2019 16:42:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBE6E28E04; Fri, 26 Apr 2019 16:42:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 094B728E04 for ; Fri, 26 Apr 2019 16:42:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ul-00088L-MC; Fri, 26 Apr 2019 16:41:31 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uj-00086I-St for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:29 +0000 X-Inumbo-ID: 23b47482-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 23b47482-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:28 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519698" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:54 +0100 Message-ID: <20190426164002.22381-8-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 07/15] arch replumbing: Replace many $r{arch} with $[g]ho->{Arch} X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change with existing flights. But the effect is that now, generally, ts-* scripts and the support code will honour host_arch, if it is set, in preference to arch. This patch contains only replacements of $r{arch} with $ho->{Arch} or $gho->{Arch}. In fact, perhaps surprisingly, there were no locations where $gho was wanted rather than $ho (I have double checked this). Exceptions, where we left $r{arch} alone, are: * make-flight: a comment, which we are about to deal with; * ts-kernel-build: we are going to support cross building and $r{arch} is going to be the architecture of the kernel we want rather than of the build host. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 14 +++++++------- Osstest/TestSupport.pm | 4 ++-- ts-freebsd-build | 2 +- ts-host-install | 6 +++--- ts-memdisk-try-append | 2 +- ts-xen-build-prep | 4 ++-- ts-xen-install | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 8abd6aed..911d8905 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -444,7 +444,7 @@ sub setupboot_grub2 ($$$$) { # Grub2 on jessie/stretch ARM* doesn't do multiboot, so we must chainload. my $need_uefi_chainload = get_host_property($ho, "firmware", "") eq "uefi" && - $ho->{Suite} =~ m/jessie|stretch/ && $r{arch} =~ m/^arm/; + $ho->{Suite} =~ m/jessie|stretch/ && $ho->{Arch} =~ m/^arm/; my $parsemenu= sub { my $f= bl_getmenu_open($ho, $rmenu, "$stash/$ho->{Name}--grub.cfg.1"); @@ -749,7 +749,7 @@ END sub preseed_microcode($$) { my ($ho,$sfx) = @_; - my $prop = "MicrocodeUpdate".ucfirst($r{arch}); + my $prop = "MicrocodeUpdate".ucfirst($ho->{Arch}); return unless $c{$prop}; logm("ucode=$prop $c{$prop}"); my $ucode = get_filecontents("$c{Images}/$c{$prop}"); @@ -1134,7 +1134,7 @@ sub di_installer_path ($) { # useable for constructing host paths as well as guest paths my ($ho) = @_; - return $ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'. + return $ho->{Tftp}{DiBase}.'/'.$ho->{Arch}.'/'. ($ho->{DiVersion} // cfg_tftp_di_version($ho->{Suite})) .'-'.$ho->{Suite}; } @@ -1340,8 +1340,8 @@ END # Userland_setarch personality to restore using setarch my $kern_arch = $kern_arch_info->{Kernel_Debian}; if ($kern_arch && - $ho->{Flags}{"arch-$r{arch}"} && !$ho->{Flags}{"arch-$kern_arch"}) { - # We check the flag for $r{arch} because for various reasons + $ho->{Flags}{"arch-$ho->{Arch}"} && !$ho->{Flags}{"arch-$kern_arch"}) { + # We check the flag for $ho->{Arch} because for various reasons # it may not be set. For example, in standalone mode it is # currently not normally necessary to set any arch hostflags. # In that situation we bet that the kern arch can be used; @@ -1356,7 +1356,7 @@ END } if ($kern_arch) { my $setarch = "setarch $kern_arch_info->{Userland_setarch}"; - logm("Using $kern_arch kernel for $r{arch} userland ($setarch)"); + logm("Using $kern_arch kernel for $ho->{Arch} userland ($setarch)"); preseed_hook_command($ho, 'late_command', $sfx, <{Arch} kernels end up being the default so shuffle them # where update-grub will not find them for f in /boot/vmlinu*; do dpkg-divert --rename --divert "/boot/~disable~\${f##*/}" "\$f" diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 16c17e37..18617d98 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2904,8 +2904,8 @@ sub setup_netboot_local_uefi ($) { # i386 is X64 because when we are trying to install i386 # on a UEFI box, it's actually an amd64-capable UEFI box # which expects a 64-bit EFI loader - die "EFI arch" unless $efi_archs{ $r{arch} }; - my $efi = $efi_archs{ $r{arch} }; + die "EFI arch" unless $efi_archs{ $ho->{Arch} }; + my $efi = $efi_archs{ $ho->{Arch} }; setup_netboot_bootcfg($ho, <{Arch} END # Build process as documented in the handbook: diff --git a/ts-host-install b/ts-host-install index 3c14f171..4bfa2f5e 100755 --- a/ts-host-install +++ b/ts-host-install @@ -61,7 +61,7 @@ our %timeout= qw(ReadPreseed 350 our $kern_arch_info; if ($build) { - if ($r{arch} eq 'i386') { + if ($ho->{Arch} eq 'i386') { $kern_arch_info = { Kernel_Debian => 'amd64', Userland_setarch => 'i386', @@ -262,7 +262,7 @@ END push @dicmdline, "domain=$c{TestHostDomain}"; push @dicmdline, get_host_property($ho, "install-append $ho->{Suite}", ''), - get_host_property($ho, "install-append $ho->{Suite} $r{arch}", ''); + get_host_property($ho, "install-append $ho->{Suite} $ho->{Arch}", ''); my $console = get_host_native_linux_console($ho); @@ -280,7 +280,7 @@ END push @hocmdline, get_host_property($ho, "linux-boot-append $ho->{Suite}", ''), - get_host_property($ho, "linux-boot-append $ho->{Suite} $r{arch}", ''); + get_host_property($ho, "linux-boot-append $ho->{Suite} $ho->{Arch}", ''); $xopts{ipappend} = $ipappend; setup_netboot_di($ho, $kernel, "/$initrd", \@dicmdline, \@hocmdline, diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index f6ec2fd5..ce39d5a7 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -23,7 +23,7 @@ arch=`perl -e ' use Osstest::TestSupport; tsreadconfig(); - print $r{arch} or die $!; + print $ho->{Arch} or die $!; '` case "$arch" in diff --git a/ts-xen-build-prep b/ts-xen-build-prep index c38ab36d..0f07648e 100755 --- a/ts-xen-build-prep +++ b/ts-xen-build-prep @@ -246,7 +246,7 @@ END if ($ho->{Suite} !~ m/lenny|squeeze/) { target_install_packages($ho, 'libfdt-dev'); } - if ($r{arch} eq 'amd64' && $ho->{Suite} !~ m/squeeze|lenny/) { + if ($ho->{Arch} eq 'amd64' && $ho->{Suite} !~ m/squeeze|lenny/) { target_install_packages($ho, 'libc6-dev-i386'); } } @@ -269,4 +269,4 @@ if (!$ho->{Flags}{'no-reinstall'}) { gitcache_setup($ho); } -host_shared_mark_ready($ho, "build-".$ho->{Suite}."-".$r{arch}); +host_shared_mark_ready($ho, "build-".$ho->{Suite}."-".$ho->{Arch}); diff --git a/ts-xen-install b/ts-xen-install index 9f78a75f..2d3c644d 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -64,7 +64,7 @@ sub packages () { if ($ho->{Suite} !~ m/lenny|squeeze/) { target_install_packages($ho, qw(libfdt1)); } - if ($r{arch} eq 'i386') { + if ($ho->{Arch} eq 'i386') { target_install_packages($ho, qw(libc6-xen)); } target_install_packages($ho, @{toolstack($ho)->{ExtraPackages}}) @@ -92,7 +92,7 @@ sub some_extradebs ($) { target_install_packages($ho, qw(rsync)) unless $rsync_installed++; target_putfile_root($ho,300, "$path/.", $ontarget, '-r'); } elsif ($path =~ m{\.deb$}) { - $path =~ s{_\.deb}{ "_$r{arch}.deb" }e; + $path =~ s{_\.deb}{ "_$ho->{Arch}.deb" }e; logm("$cfgvar: installing $path"); $ontarget = basename($path); $dpkgopts = '-iB'; @@ -115,7 +115,7 @@ sub extradebs () { # $c{ DebianExtraPackages___ } my $firmware = get_host_property($ho, "firmware", "bios"); - some_extradebs([ 'DebianExtraPackages', $firmware, $r{arch}, $suite ]); + some_extradebs([ 'DebianExtraPackages', $firmware, $ho->{Arch}, $suite ]); } sub extract () { @@ -193,7 +193,7 @@ sub setupboot () { my $xenhopt= "conswitch=x watchdog noreboot async-show-all"; my $cons= get_host_property($ho, 'XenSerialConsole', - $r{arch} =~ m/^arm/ ? 'dtuart' + $ho->{Arch} =~ m/^arm/ ? 'dtuart' : 'com1'); if ( $cons eq "com1" ) { From patchwork Fri Apr 26 16:39:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919411 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B29B14C0 for ; Fri, 26 Apr 2019 16:43:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C55C28DEB for ; Fri, 26 Apr 2019 16:43:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60EBA28E17; Fri, 26 Apr 2019 16:43:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5EC1528DEB for ; Fri, 26 Apr 2019 16:43:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3um-00089R-BL; Fri, 26 Apr 2019 16:41:32 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ul-00087i-55 for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:31 +0000 X-Inumbo-ID: 2451b3cb-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 2451b3cb-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:29 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519708" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:55 +0100 Message-ID: <20190426164002.22381-9-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 08/15] arch replumbing: make-flight: Fix $r{arch} comment X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This comment was lamenting the very problem we are fixing now. It would now be possible to test i386->amd64 tools migration, by writing an appropriate test job with different src_host_arch and dst_host_arch etc. Signed-off-by: Ian Jackson --- make-flight | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-flight b/make-flight index c5411412..020ad5f1 100755 --- a/make-flight +++ b/make-flight @@ -833,8 +833,8 @@ test_matrix_do_one () { all_hostflags="$hf" fi # TODO it would be nice to test i386->amd64 tools migration too (for - # Xen >= 4.6), but currently $r{arch} is used in several places, - # which would need looking at. + # Xen >= 4.6). Previously $r{arch} was used in several places, + # which made this more complicated, but this is now fixed. fi if [ x$test_pvh = xy -a $xenarch = amd64 -a $dom0arch = amd64 ]; then From patchwork Fri Apr 26 16:39:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1607214C0 for ; Fri, 26 Apr 2019 16:42:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03EFF28DEB for ; Fri, 26 Apr 2019 16:42:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC2E528E04; Fri, 26 Apr 2019 16:42:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A313D28DEB for ; Fri, 26 Apr 2019 16:42:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3up-0008DE-Nq; Fri, 26 Apr 2019 16:41:35 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uo-0008Bj-54 for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:34 +0000 X-Inumbo-ID: 24ca6f70-6842-11e9-809e-b371eaf24b5c Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 24ca6f70-6842-11e9-809e-b371eaf24b5c; Fri, 26 Apr 2019 16:41:31 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519715" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:56 +0100 Message-ID: <20190426164002.22381-10-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 09/15] arch replumbing: ts-debian-di-install: Use $gho->{Arch} X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is just tidying up. The only effect is that now these would honour $r{all_guest_arch} as a fallback. But right now, $r{GUEST_arch} will always be set, and that is what ends up in $gho->{Arch}. Signed-off-by: Ian Jackson --- ts-debian-di-install | 2 +- ts-debian-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts-debian-di-install b/ts-debian-di-install index 5cb3d35d..9abb4956 100755 --- a/ts-debian-di-install +++ b/ts-debian-di-install @@ -174,7 +174,7 @@ END } sub ginstall () { - my $arch= $r{"$gho->{Guest}_arch"}; + my $arch= $gho->{Arch}; my $method= $r{"$gho->{Guest}_method"}; my $tmpdir= "/root/$flight-$job-di"; diff --git a/ts-debian-install b/ts-debian-install index 5bbaead0..f07dd676 100755 --- a/ts-debian-install +++ b/ts-debian-install @@ -47,7 +47,7 @@ sub prep () { } sub ginstall () { - my $arch= $r{"$gho->{Guest}_arch"}; + my $arch= $gho->{Arch}; my $archarg= defined($arch) ? "--arch $arch" : ''; my $gsuite= debian_guest_suite($gho); From patchwork Fri Apr 26 16:39:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 29909912 for ; Fri, 26 Apr 2019 16:43:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18E6328DEB for ; Fri, 26 Apr 2019 16:43:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D86928E04; Fri, 26 Apr 2019 16:43:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A8FC028DEB for ; Fri, 26 Apr 2019 16:43:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uq-0008Df-2T; Fri, 26 Apr 2019 16:41:36 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3up-0008CT-0O for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:35 +0000 X-Inumbo-ID: 25c90e3d-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 25c90e3d-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:32 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519725" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:57 +0100 Message-ID: <20190426164002.22381-11-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 10/15] ts-kernel-build: Introduce cmd() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Right now this is a simple wrapper around target_cmd_build. No functional change. Signed-off-by: Ian Jackson --- ts-kernel-build | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ts-kernel-build b/ts-kernel-build index 3dad7d36..72ca98a1 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -48,6 +48,11 @@ my $parms = $archparms->{ $r{arch} }; sub enable_xen_config (); +sub cmd ($$) { + my ($timeout, $script) = @_; + target_cmd_build($ho, $timeout, $builddir, $script); +} + sub checkout () { return if $reuse; @@ -58,7 +63,7 @@ sub checkout () { if (length($r{tree_pq_linux})) { build_clone($ho, 'pq_linux', $builddir, 'linux/.hg/patches'); - target_cmd_build($ho, 1000, $builddir, <{DefConfig} ? $parms->{DefConfig}."_defconfig" : "defconfig"; - target_cmd_build($ho, 1000, $builddir, <&1 && touch ../build-ok-stamp) |tee ../log test -f ../build-ok-stamp @@ -400,7 +405,7 @@ sub kinstall () { my $dtbs_install = ''; $dtbs_install = 'dtbs_install' if $parms->{Dtbs}; - target_cmd_build($ho, 300, $builddir, < X-Patchwork-Id: 10919413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B97E14C0 for ; Fri, 26 Apr 2019 16:43:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AF2E28DEB for ; Fri, 26 Apr 2019 16:43:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F7BE28E04; Fri, 26 Apr 2019 16:43:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1148B28DEB for ; Fri, 26 Apr 2019 16:43:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ut-0008ID-Q0; Fri, 26 Apr 2019 16:41:39 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3us-0008GY-NE for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:38 +0000 X-Inumbo-ID: 26c24244-6842-11e9-a407-8beefea5a8fc Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 26c24244-6842-11e9-a407-8beefea5a8fc; Fri, 26 Apr 2019 16:41:34 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519740" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:58 +0100 Message-ID: <20190426164002.22381-12-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 11/15] cross builds: ts-kernel-build: Support cross target armhf X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , Stefano Stabellini , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ian Jackson CC: Julien Grall CC: Stefano Stabellini Acked-by: Julien Grall --- ts-kernel-build | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/ts-kernel-build b/ts-kernel-build index 72ca98a1..29c6c43d 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -21,6 +21,7 @@ BEGIN { unshift @INC, qw(.); } use Osstest; use Osstest::TestSupport; use Osstest::BuildSupport; +use Carp; tsreadconfig(); @@ -48,9 +49,24 @@ my $parms = $archparms->{ $r{arch} }; sub enable_xen_config (); +our $arch_envvars = ''; + sub cmd ($$) { my ($timeout, $script) = @_; - target_cmd_build($ho, $timeout, $builddir, $script); + target_cmd_build($ho, $timeout, $builddir, $arch_envvars.$script); +} + +sub checkarch () { + return if $r{arch} eq $ho->{Arch}; + my $cc = 'gcc'; + if ($r{arch} eq 'armhf') { + target_install_packages($ho, "crossbuild-essential-$r{arch}"); + $arch_envvars = < X-Patchwork-Id: 10919401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27C71912 for ; Fri, 26 Apr 2019 16:43:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1770228DEB for ; Fri, 26 Apr 2019 16:43:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B02428E04; Fri, 26 Apr 2019 16:43:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AC2BE28DEB for ; Fri, 26 Apr 2019 16:43:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ut-0008Hb-D2; Fri, 26 Apr 2019 16:41:39 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3us-0008G7-9V for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:38 +0000 X-Inumbo-ID: 28a4586c-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 28a4586c-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:37 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519742" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:59 +0100 Message-ID: <20190426164002.22381-13-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 12/15] cross builds: mfi-common: Break out set_build_hostflags X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Verified with standalone-generate-dump-flight-runvars. Signed-off-by: Ian Jackson --- mfi-common | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index f91156fe..dad03e39 100644 --- a/mfi-common +++ b/mfi-common @@ -216,6 +216,11 @@ create_xen_build_job () { $extra_runvars } +set_build_hostflags () { + # set_build_hostflags HOST_ARCH + build_hostflags="share-build-$suite-$1,arch-$1,suite-$suite,purpose-build" +} + create_build_jobs () { local arch @@ -342,7 +347,7 @@ create_build_jobs () { arch_runvars=\"\$ARCH_RUNVARS_$arch\" " - build_hostflags=share-build-$suite-$arch,arch-$arch,suite-$suite,purpose-build + set_build_hostflags $arch for enable_xsm in $(xsm_variants $arch) ; do if [ x$enable_xsm = xtrue ] ; then From patchwork Fri Apr 26 16:40:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 53B76912 for ; Fri, 26 Apr 2019 16:43:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4368128DEB for ; Fri, 26 Apr 2019 16:43:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37BB128E04; Fri, 26 Apr 2019 16:43:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CCF0A28DEB for ; Fri, 26 Apr 2019 16:43:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3v1-0008RJ-AD; Fri, 26 Apr 2019 16:41:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uz-0008Pa-Up for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:45 +0000 X-Inumbo-ID: 2bdee566-6842-11e9-916f-1b696d25bbd7 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2bdee566-6842-11e9-916f-1b696d25bbd7; Fri, 26 Apr 2019 16:41:42 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519759" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:40:00 +0100 Message-ID: <20190426164002.22381-14-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 13/15] cross builds: mfi-common: Prepare for kernel cross building X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Introduce job_create_build_crossable, which takes a target->host architecture map in its arguments, and use it for build-kern, passing an empty architecture map. Overall functional change is only to add host_arch=$arch to the kernel build jobs, which has no ultimate effect because it's the same as the arch=$arch. (Difference in flight construction verified with standalone-generate-dump-flight-runvars.) Signed-off-by: Ian Jackson --- mfi-common | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/mfi-common b/mfi-common index dad03e39..7b5c894f 100644 --- a/mfi-common +++ b/mfi-common @@ -216,6 +216,32 @@ create_xen_build_job () { $extra_runvars } +job_create_build_crossable () { + # job_create_build_crossable \ + # JOBNAME RECIPE ARCH \ + # [TARGARCH1 HOSTARCH1 [TARGARCH2 HOSTARCH2 ...]]] - \ + # [RUNVAR1 [RUNVAR2 ...]] + local name=$1; shift + local recipe=$1; shift + local arch=$1; shift + local match_arch=$arch + local host_arch=$arch + while true; do + local t_targarch=$1; shift; if [ x$t_targarch = x- ]; then break; fi + local t_hostarch=$1; shift + if [ x$match_arch = x$t_targarch ]; then + host_arch=$t_hostarch + match_arch=X # prevents us mapping again, which would be a bit mad + fi + done + local build_hostflags + set_build_hostflags $host_arch + job_create_build $name $recipe \ + arch=$arch host_arch=$host_arch \ + host_hostflags=$build_hostflags \ + "$@" +} + set_build_hostflags () { # set_build_hostflags HOST_ARCH build_hostflags="share-build-$suite-$1,arch-$1,suite-$suite,purpose-build" @@ -397,11 +423,11 @@ create_build_jobs () { revision_qemuu=$REVISION_QEMU_UPSTREAM fi - job_create_build build-$arch-pvops build-kern \ - arch=$arch kconfighow=xen-enable-xen-config \ + job_create_build_crossable build-$arch-pvops build-kern $arch \ + - \ + kconfighow=xen-enable-xen-config \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ $hostos_runvars \ - host_hostflags=$build_hostflags \ $pvops_kernel $pvops_kconfig_overrides \ ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX} \ tree_linuxfirmware=$TREE_LINUXFIRMWARE \ From patchwork Fri Apr 26 16:40:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919419 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B400912 for ; Fri, 26 Apr 2019 16:43:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A5D728DEB for ; Fri, 26 Apr 2019 16:43:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EF2928E04; Fri, 26 Apr 2019 16:43:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 44AE028DEB for ; Fri, 26 Apr 2019 16:43:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3v5-0008WJ-LU; Fri, 26 Apr 2019 16:41:51 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3v4-0008Ug-6d for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:50 +0000 X-Inumbo-ID: 2f03bac8-6842-11e9-9eaf-070597e24fe2 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2f03bac8-6842-11e9-9eaf-070597e24fe2; Fri, 26 Apr 2019 16:41:47 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519767" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:40:01 +0100 Message-ID: <20190426164002.22381-15-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 14/15] cross builds: Build armhf kernels on amd64 hosts X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , Stefano Stabellini , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Our armhf hosts are devboards and very slow, as well as scarce. It 5takes 17ks or so for a kernel build. This will go *much* faster on an amd64 box and we have lots of those too. standalone-generate-dump-flight-runvars shows that the only change is to change host_arch from armhf to amd64 in build-armhf-pvops jobs. Signed-off-by: Ian Jackson CC: Julien Grall CC: Stefano Stabellini Acked-by: Julien Grall --- mfi-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index 7b5c894f..30f2692d 100644 --- a/mfi-common +++ b/mfi-common @@ -424,7 +424,7 @@ create_build_jobs () { fi job_create_build_crossable build-$arch-pvops build-kern $arch \ - - \ + armhf amd64 - \ kconfighow=xen-enable-xen-config \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ $hostos_runvars \ From patchwork Fri Apr 26 16:40:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C7E714C0 for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ABE228DEB for ; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CDE128E04; Fri, 26 Apr 2019 16:42:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A31E928DEB for ; Fri, 26 Apr 2019 16:42:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3vA-00009h-2c; Fri, 26 Apr 2019 16:41:56 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3v8-00007s-Dt for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:54 +0000 X-Inumbo-ID: 322a8b0a-6842-11e9-9f0a-23698108754f Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 322a8b0a-6842-11e9-9f0a-23698108754f; Fri, 26 Apr 2019 16:41:53 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519775" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:40:02 +0100 Message-ID: <20190426164002.22381-16-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 15/15] ts-kernel-build: Move main program to bottom of script X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Having it in the middle makes it quite hard to find ! No functional change. Signed-off-by: Ian Jackson --- ts-kernel-build | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ts-kernel-build b/ts-kernel-build index 29c6c43d..b9ba9ef5 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -466,20 +466,6 @@ sub fwinstall () { END } -checkarch(); -checkout(); -config(); -build(); -kinstall(); -if ($r{tree_linuxfirmware}) { - fwbuild(); - fwinstall(); -} -built_stash($ho, $builddir, 'dist', 'kerndist'); -built_stash_debugfile($ho, $builddir, 'vmlinux', 'linux/vmlinux'); -built_compress_stashed('vmlinux'); -built_stash_debugfile($ho, $builddir, 'config', 'linux/.config'); - sub enable_xen_config () { return <<'END'; #!/bin/sh @@ -633,3 +619,17 @@ setopt CONFIG_TEGRA_HOST1X n exit 0 END } + +checkarch(); +checkout(); +config(); +build(); +kinstall(); +if ($r{tree_linuxfirmware}) { + fwbuild(); + fwinstall(); +} +built_stash($ho, $builddir, 'dist', 'kerndist'); +built_stash_debugfile($ho, $builddir, 'vmlinux', 'linux/vmlinux'); +built_compress_stashed('vmlinux'); +built_stash_debugfile($ho, $builddir, 'config', 'linux/.config');