From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 2/4] import enable-xen-config from xen.git, use for ts-kernel-build Date: Thu, 20 Mar 2014 15:56:26 +0000 Message-ID: <1395330988-4613-2-git-send-email-ian.campbell@citrix.com> References: <1395229554.10203.74.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: <1395229554.10203.74.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 I plan to remove it from xen.git. Take the version from a03984e7bcdf which hasn't changed since 8dedf6431393 in 2010. Update ts-kernel-build to not require xen.git. config_intree_buildconfigs was unused so remove it. Signed-off-by: Ian Campbell --- v2: Import into a here document. Placed at the end since it is long.` --- mfi-common | 2 - ts-kernel-build | 155 +++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 136 insertions(+), 21 deletions(-) diff --git a/mfi-common b/mfi-common index 52ed4d4..df7f8b0 100644 --- a/mfi-common +++ b/mfi-common @@ -153,11 +153,9 @@ create_build_jobs () { ./cs-job-create $flight build-$arch-pvops build-kern \ arch=$arch kconfighow=xen-enable-xen-config \ - tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ $suite_runvars \ host_hostflags=$build_hostflags \ - revision_xen=$REVISION_XEN \ $pvops_kernel $pvops_kconfig_overrides \ ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX} \ tree_linuxfirmware=$TREE_LINUXFIRMWARE \ diff --git a/ts-kernel-build b/ts-kernel-build index 05d9e96..df31709 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -38,11 +38,11 @@ my $archparms = { 'amd64' => { DefConfig => 'defconfig', KernelImage => 'arch/x86/boot/bzImage' } }; +sub enable_xen_config (); + sub checkout () { target_cmd($ho, "rm -rf $builddir && mkdir $builddir", 600); - build_clone($ho, 'xen', $builddir, 'xen-unstable'); - build_clone($ho, 'linux', $builddir, 'linux'); if (length($r{tree_pq_linux})) { @@ -250,8 +250,9 @@ $config_features $config_runvars END + target_putfilecontents_stash($ho,1000,enable_xen_config(),"$builddir/enable-xen-config"); + target_cmd_build($ho, 1000, $builddir, <enable-device-configs - ed <$edscript enable-device-configs - chmod +x enable-device-configs - cd linux - make -f buildconfigs/Rules.mk defconfig " 1>&2 + exit 1 +fi + +CONFIG=$1 + +setopt() +{ + OPTION=$1 + VALUE=$2 + + # First remove any existing instances of this option + sed -e "s/^# ${OPTION} is not set$//g ; s/^${OPTION}=.*$//g" -i "${CONFIG}" + + # Then append the new value + case ${VALUE} in + n) echo "# ${OPTION} is not set" >> "${CONFIG}" ;; + y|m|*) echo "${OPTION}=${VALUE}" >> "${CONFIG}" ;; + esac +} + +setopt CONFIG_PARAVIRT y +setopt CONFIG_PARAVIRT_DEBUG y +setopt CONFIG_PARAVIRT_GUEST y +setopt CONFIG_PARAVIRT_SPINLOCKS y + +setopt CONFIG_XEN y +setopt CONFIG_XEN_BLKDEV_FRONTEND y +setopt CONFIG_XEN_NETDEV_FRONTEND y +setopt CONFIG_XEN_KBDDEV_FRONTEND y +setopt CONFIG_XEN_FBDEV_FRONTEND y +setopt CONFIG_XEN_PCIDEV_FRONTEND y +setopt CONFIG_XEN_BALLOON y +setopt CONFIG_XEN_SCRUB_PAGES y +setopt CONFIG_XEN_DEV_EVTCHN y +setopt CONFIG_XEN_BACKEND y +setopt CONFIG_XEN_BLKDEV_BACKEND y +setopt CONFIG_XEN_BLKDEV_TAP y +setopt CONFIG_XEN_NETDEV_BACKEND y +setopt CONFIG_XEN_PCIDEV_BACKEND y +setopt CONFIG_XEN_PCIDEV_BACKEND_VPCI y +setopt CONFIG_XEN_PCIDEV_BACKEND_PASS n +setopt CONFIG_XEN_PCIDEV_BACKEND_SLOT n +setopt CONFIG_XEN_PCIDEV_BE_DEBUG n +setopt CONFIG_XENFS y +setopt CONFIG_XEN_COMPAT_XENFS y +setopt CONFIG_XEN_PCI_PASSTHROUGH y +setopt CONFIG_HVC_XEN y +setopt CONFIG_XEN_MAX_DOMAIN_MEMORY 32 +setopt CONFIG_XEN_DEBUG_FS y +setopt CONFIG_XEN_DOM0 y +setopt CONFIG_XEN_SYS_HYPERVISOR y +setopt CONFIG_XEN_GNTDEV y +setopt CONFIG_XEN_PLATFORM_PCI y + +setopt CONFIG_VMI y +setopt CONFIG_TUN y + +setopt CONFIG_KVM y +setopt CONFIG_KVM_INTEL y +setopt CONFIG_KVM_AMD y +setopt CONFIG_KVM_CLOCK y +setopt CONFIG_KVM_GUEST n +setopt CONFIG_KVM_TRACE n + +setopt CONFIG_LGUEST n + +setopt CONFIG_LOCALVERSION_AUTO n + +setopt CONFIG_BRIDGE y + +setopt CONFIG_DEBUG_STACK_USAGE n + +setopt CONFIG_MEMORY_HOTPLUG y +setopt CONFIG_MEMORY_HOTREMOVE y + +setopt CONFIG_MIGRATION n + +setopt CONFIG_ACPI_HOTPLUG_MEMORY n + +# Should all be set one way or another in defconfig but aren't +setopt CONFIG_NUMA n +setopt CONFIG_X86_VSMP n +setopt CONFIG_X86_UV n +setopt CONFIG_CALGARY_IOMMU n +setopt CONFIG_AMD_IOMMU n +setopt CONFIG_MAXSMP n +setopt CONFIG_SPARSEMEM_VMEMMAP n +setopt CONFIG_I7300_IDLE n +setopt CONFIG_DMAR n +setopt CONFIG_INTR_REMAP n +setopt CONFIG_GFS2_FS n +setopt CONFIG_IOMMU_DEBUG n +setopt CONFIG_X86_MCE_INTEL n +setopt CONFIG_X86_MCE_AMD n +setopt CONFIG_CRYPTO_AES_NI_INTEL n +setopt CONFIG_CISS_SCSI_TAPE n + +setopt CONFIG_FUSION y +setopt CONFIG_FUSION_SPI m +setopt CONFIG_FUSION_SAS m +setopt CONFIG_FUSION_FC m +setopt CONFIG_FUSION_MAX_SGE 128 +setopt CONFIG_FUSION_CTL n +setopt CONFIG_FUSION_LOGGING n + +setopt CONFIG_BLK_CPQ_CISS_DA m + +case ${XEN_TARGET_ARCH} in + x86_32) setopt CONFIG_64BIT n ;; + x86_64) + setopt CONFIG_64BIT y + setopt CONFIG_IA32_EMULATION y + setopt CONFIG_IA32_AOUT n + setopt CONFIG_CRYPTO_AES_X86_64 n + setopt CONFIG_CRYPTO_SALSA20_X86_64 n + setopt CONFIG_CRYPTO_TWOFISH_X86_64 n + ;; + *) ;; +esac + +exit 0 +END +} -- 1.8.5.2