From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 1/2] Revert "mfi-common: Only override the pvops kernel repo for linux-arm-xen branch" Date: Tue, 11 Feb 2014 12:41:59 +0000 Message-ID: <1392122520-5453-1-git-send-email-ian.campbell@citrix.com> References: <1392122393.26657.102.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1392122393.26657.102.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org This reverts commit a528b10cd6a552e92ed2b1b809c991a421ebdba6. Fixing this in make-flight was incorrect -- make-flight should do as it was told and use the appropriate TREE_LINUX(_ARCH) and REVISION_LINUX(_ARCH) values it is given. The real issue here was that these inputs were bogus for the linux-linus tree when running on armhf and this will be fixed in a followup patch. Signed-off-by: Ian Campbell --- mfi-common | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/mfi-common b/mfi-common index f7f981e..8f56092 100644 --- a/mfi-common +++ b/mfi-common @@ -44,11 +44,6 @@ create_build_jobs () { if [ "x$arch" = xdisable ]; then continue; fi - pvops_kernel=" - tree_linux=$TREE_LINUX - revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} - " - case "$arch" in armhf) case "$branch" in @@ -64,13 +59,10 @@ create_build_jobs () { xen-4.1-testing) continue;; xen-4.2-testing) continue;; esac - - if [ "$branch" = "linux-arm-xen" ]; then - pvops_kernel=" - tree_linux=$TREE_LINUX_ARM - revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} - " - fi + pvops_kernel=" + tree_linux=$TREE_LINUX_ARM + revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} + " pvops_kconfig_overrides=" kconfig_override_y=CONFIG_EXT4_FS " @@ -79,6 +71,10 @@ create_build_jobs () { case "$branch" in linux-arm-xen) continue;; esac + pvops_kernel=" + tree_linux=$TREE_LINUX + revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} + " ;; esac -- 1.8.5.2