From patchwork Mon May 2 15:55:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Lai X-Patchwork-Id: 8993961 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7D8AA9F1D3 for ; Mon, 2 May 2016 17:27:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 912EB2024D for ; Mon, 2 May 2016 17:27:12 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ACA1B2024C for ; Mon, 2 May 2016 17:27:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axHZD-0004NX-3P; Mon, 02 May 2016 17:23:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axHZC-0004NR-Ao for xen-devel@lists.xenproject.org; Mon, 02 May 2016 17:23:30 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 89/F5-03002-11D87275; Mon, 02 May 2016 17:23:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRWlGSWpSXmKPExsXS1tYhoivQqx5 usGazhcX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmvF6sm3Bb6GK/nWTmBoYN/N3MXJyCAlUSrQ9 /cYEYksI8EocWTaDFcL2k/jduJwZoqZCYvXtPUBxLiB7KaPE3skXWSESZRJ3Tj4Ca2YRUJHY2 r8HLM4moCqx/NwkRhBbREBJ4t6qyWA1zAJ6EkebmsCGCgtoSPx+sIcFxOYVsJboPrkNyhaUOD nzCQtEvZbEjX8vgXo5gGxpieX/OEDCokCrppzcxjaBUWAWko5ZSDpmIXQsYGRexahRnFpUllq ka2iul1SUmZ5RkpuYmaNraGCsl5taXJyYnpqTmFSsl5yfu4kRGJgMQLCD8eVpz0OMkhxMSqK8 ok3q4UJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeGd0A+UEi1LTUyvSMnOAMQKTluDgURLh3dMFl OYtLkjMLc5Mh0idYlSUEudNA+kTAElklObBtcHi8hKjrJQwLyPQIUI8BalFuZklqPKvGMU5GJ WEeaNApvBk5pXATX8FtJgJaHH2elWQxSWJCCmpBkajif/k+oyKZtz553opOOTkJiH5Tu4rBoX ZJefv/ktRS/eUzfyWvdbcY87UNO73TMr/Nq6dsnLuwZX+ERqPE/yvyKyP+nv20tHrUteOHbRa FqI3I2Nj/G5bu6eLPibesVl9yoXxfuMZb5ubq758Cv7U4B+xN2mejZ//7blX933719q746mL1 XRLJZbijERDLeai4kQACwp1B8YCAAA= X-Env-Sender: pclai@intel.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1462209808!38018348!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20258 invoked from network); 2 May 2016 17:23:28 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-2.tower-31.messagelabs.com with SMTP; 2 May 2016 17:23:28 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP; 02 May 2016 10:23:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,568,1455004800"; d="scan'208";a="95761425" Received: from scymds01.sc.intel.com ([10.82.194.37]) by fmsmga004.fm.intel.com with ESMTP; 02 May 2016 10:23:26 -0700 Received: from rhel7-dev.intel.com (rhel7-dev.sc.intel.com [143.183.85.147]) by scymds01.sc.intel.com with ESMTP id u42HNQEY030314; Mon, 2 May 2016 10:23:26 -0700 Received: by rhel7-dev.localdomain (Postfix, from userid 1002) id 4856D856187D; Mon, 2 May 2016 08:55:02 -0700 (PDT) Date: Mon, 2 May 2016 08:55:02 -0700 From: Paul Lai To: xen-devel@lists.xenproject.org Message-ID: <20160502155502.GA29157@rhel7-dev.sc.intel.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: ian.campbell@citrix.com, jbeulich@suse.com Subject: [Xen-devel] Patch to honor --enable-githttp X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 747f48e6dd7bcc2fbe14d37c62018c5c9e0e44c8 Author: Paul Lai Date: Mon Apr 11 10:43:57 2016 -0700 Honor '--enable-githttp' in toplevel Makefile generation During the make world, git mini-os.git didn't honor the 'configure --enable-githttp' option. The 'enable-githttp' was only honored in the tools subdirectory. Signed-off-by: Paul Lai diff --git a/config/Toplevel.mk.in b/config/Toplevel.mk.in index 4db7eaf..1d99189 100644 --- a/config/Toplevel.mk.in +++ b/config/Toplevel.mk.in @@ -1 +1,2 @@ SUBSYSTEMS := @SUBSYSTEMS@ +GIT_HTTP := @githttp@ diff --git a/configure b/configure index 3c269fa..78e8025 100755 --- a/configure +++ b/configure @@ -594,6 +594,7 @@ stubdom tools xen subdirs +githttp XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR @@ -660,6 +661,7 @@ enable_option_checking with_initddir with_sysconfig_leaf_dir with_xen_dumpdir +enable_githttp enable_xen enable_tools enable_stubdom @@ -1284,6 +1286,8 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-githttp Download GIT repositories via HTTP (default is + DISABLED) --disable-xen Disable build and install of xen --disable-tools Disable build and install of tools --enable-stubdom Enable build and install of stubdom @@ -1985,6 +1989,29 @@ XEN_DUMP_DIR=$xen_dumpdir_path +# Check whether --enable-githttp was given. +if test "${enable_githttp+set}" = set; then : + enableval=$enable_githttp; +fi + + +if test "x$enable_githttp" = "xno"; then : + + ax_cv_githttp="n" + +elif test "x$enable_githttp" = "xyes"; then : + + ax_cv_githttp="y" + +elif test -z $ax_cv_githttp; then : + + ax_cv_githttp="n" + +fi +githttp=$ax_cv_githttp + + + case "$host_cpu" in i[3456]86|x86_64) arch_enable_stubdom=y diff --git a/configure.ac b/configure.ac index 1843b52..7388b28 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,7 @@ m4_include([m4/subsystem.m4]) m4_include([m4/paths.m4]) AX_XEN_EXPAND_CONFIG() +AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) dnl mini-os is only ported to certain platforms case "$host_cpu" in