From patchwork Mon May 2 16:36:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Lai X-Patchwork-Id: 8993831 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E791EBF29F for ; Mon, 2 May 2016 16:39:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31F4220219 for ; Mon, 2 May 2016 16:39:13 +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 568E7200E1 for ; Mon, 2 May 2016 16:39: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 1axGq7-0000pO-UU; Mon, 02 May 2016 16:36:55 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axGq6-0000pI-0m for xen-devel@lists.xenproject.org; Mon, 02 May 2016 16:36:54 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 96/3F-07120-52287275; Mon, 02 May 2016 16:36:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHKsWRWlGSWpSXmKPExsXS1tbhqKvSpB5 usOqmpMX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmvHjzkmmgok7GSsapj1haWA8tZaxi5GTQ0ig QmLxyXdgtoQAr8SRZTNYuxg5gOxgiQVd4RAldRJHp81h62LkArJ3Mkq82vCACcJZxyhx/dR8N pAGNgEtiaUveUAaRARcJXr+P2MGsYUFNCR+P9jDAlIiIqArcXB+HUSJnsTO98/YQWwWARWJs4 +fgtm8AoESzZMPgtmMAmIS30+tYQKxmQXEJW49mc8EcaaIxMOLp9kgbFGJl4//sULYihJ/v25 lh6jPkGhomg01U1Di5MwnLBC/KEo0THjCPoFRdBaSsbOQtMxC0gIRz5OYunUDO4StI7Fg9yc2 CFtbYtnC18ww9pkDj5kwxZ0lLky5DVWvKTHx5xnWWcCQYxZYzyjxeeVaVoiEosSU7ofsCxh5V jGqF6cWlaUW6RrqJRVlpmeU5CZm5ugaGpjp5aYWFyemp+YkJhXrJefnbmIExjsDEOxg3Pnc6R CjJAeTkijvpCz1cCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvKaNQDnBotT01Iq0zBxg4oFJS3D wKInwBoGkeYsLEnOLM9MhUqcYFaXEef83ACUEQBIZpXlwbbBkd4lRVkqYlxHoECGegtSi3MwS VPlXjOIcjErCvNYg43ky80rgpr8CWswEtDh7vSrI4pJEhJRUAyPvsgzuok1njcOnX7mUfyx4k tK7448O3lsYse+OyWH+H2UximtP7VYNNq9oZVdQFzZ59n+fdHhyoLpO3NW5/r+kRW45Lvm+qq O5UXDpjbWbLurfYNSdJnwjacKvmG3P0l4zFV38Uze5eE3kxjNe3M+jZC8vnthk1Bq7zoIvz8l Adc0ZS4eu7UpKLMUZiYZazEXFiQDIOg7ncQMAAA== X-Env-Sender: paul.c.lai@intel.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1462207011!12260097!1 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.0 required=7.0 tests=HTML_MESSAGE X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35888 invoked from network); 2 May 2016 16:36:51 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-14.tower-21.messagelabs.com with SMTP; 2 May 2016 16:36:51 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 02 May 2016 09:36:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,568,1455004800"; d="scan'208,217";a="944549627" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga001.jf.intel.com with ESMTP; 02 May 2016 09:36:49 -0700 Received: from orsmsx111.amr.corp.intel.com (10.22.240.12) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 2 May 2016 09:36:49 -0700 Received: from orsmsx109.amr.corp.intel.com ([169.254.11.210]) by ORSMSX111.amr.corp.intel.com ([169.254.12.58]) with mapi id 14.03.0248.002; Mon, 2 May 2016 09:36:49 -0700 From: "Lai, Paul C" To: "xen-devel@lists.xenproject.org" Thread-Topic: Patch to honor --enable-githttp Thread-Index: AdGkkE79icnCVBO4Rp25sg0KflXO6Q== Date: Mon, 2 May 2016 16:36:48 +0000 Message-ID: <8CA46881B83C354B99AD61C20C93EB1BD509CF@ORSMSX109.amr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.22.254.139] MIME-Version: 1.0 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,HTML_MESSAGE, 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 The following patch fixes the toplevel Xen makefile gereration to honor -enable-githttp if the option is used during configuration. commit 040510913564ec7e9f46ce833f8bdf1a40950ff7 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. 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