[Xen-devel,OSSTEST,05/17] Remove support for building the XCP kernel

Message ID 1390384501-20552-5-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell Jan. 22, 2014, 9:54 a.m.
This kernel is well and truly dead.

I've left some of the general support for using other kernel types in place
even though it is now unused.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 cr-daily-branch   |  1 -
 cr-external-linux |  1 -
 make-flight       |  7 -------
 mfi-common        | 18 ------------------
 4 files changed, 27 deletions(-)

Patch

diff --git a/cr-daily-branch b/cr-daily-branch
index e343a99..fa29045 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -137,7 +137,6 @@  xen)
 linux)
         realtree=linux
 	NEW_REVISION=$REVISION_LINUX
-	export REVISION_LINUX_XCP=disable
 	export REVISION_LINUX_OLD=disable
 	: ${GITFORCEFLAG:=$GITFORCEFLAG_TREE_LINUX_THIS}
 	;;
diff --git a/cr-external-linux b/cr-external-linux
index 2d1a826..073fc86 100755
--- a/cr-external-linux
+++ b/cr-external-linux
@@ -40,7 +40,6 @@  select_branch
 check_stop external-linux.
 
 export REVISION_LINUX_OLD=disable
-export REVISION_LINUX_XCP=disable
 export REVISION_XEN="`./ap-fetch-version-baseline $xenbranch`"
 export TREE_LINUX="$url"
 
diff --git a/make-flight b/make-flight
index 5136d09..8eaec51 100755
--- a/make-flight
+++ b/make-flight
@@ -174,11 +174,6 @@  for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
                 kernbuild=pvops
                 kernkind=pvops
                 ;;
-    -xcpkern)
-                kernbuild=xcpkern
-                kernkind=2627
-                if [ "x$REVISION_LINUX_XCP" = xdisable ]; then continue; fi
-                ;;
     *)          echo >&2 "kernkind ?  $kern"; exit 1 ;;
     esac
 
@@ -196,8 +191,6 @@  for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
           arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\"
       "
 
-      if [ x$kern = x-xcpkern -a $dom0arch != i386 ]; then continue; fi
-
       debian_runvars="debian_kernkind=$kernkind debian_arch=$dom0arch"
       if [ $guestsuite != $defguestsuite ] ; then
           debian_runvars="$debian_runvars debian_suite=$guestsuite"
diff --git a/mfi-common b/mfi-common
index 97bc506..82bc875 100644
--- a/mfi-common
+++ b/mfi-common
@@ -175,24 +175,6 @@  create_build_jobs () {
 
     fi
 
-    if false && [ $arch = i386 -a "x$REVISION_LINUX_XCP" != xdisable ]; then
-      # XCP dom0 kernel is 32-bit only
-
-      ./cs-job-create $flight build-$arch-xcpkern build-kern            \
-                $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_XCP_RUNVARS        \
-                $arch_runvars $suite_runvars                            \
-                arch=$arch                                              \
-        kconfighow=intree-buildconfigs kimagefile=arch/x86/boot/vmlinuz \
-                host_hostflags=$build_hostflags                         \
-                tree_xen=$TREE_XEN                                      \
-                revision_xen=$REVISION_XEN                              \
-        tree_linux=$TREEBASE_LINUX_XCP.hg                               \
-     tree_pq_linux=$TREEBASE_LINUX_XCP.pq.hg                            \
-        revision_linux=$REVISION_LINUX_XCP                              \
-        revision_pq_linux=$REVISION_PQ_LINUX_XCP
-
-    fi
-
   done
 }