From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=qin.long@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D51C42265A35D for ; Wed, 11 Apr 2018 20:09:33 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Apr 2018 20:08:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,439,1517904000"; d="scan'208";a="46240746" Received: from shwdepsi940.ccr.corp.intel.com ([10.239.9.147]) by fmsmga001.fm.intel.com with ESMTP; 11 Apr 2018 20:08:23 -0700 From: Long Qin To: lersek@redhat.com, ting.ye@intel.com Cc: edk2-devel@lists.01.org Date: Thu, 12 Apr 2018 11:08:00 +0800 Message-Id: <20180412030801.14216-2-qin.long@intel.com> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180412030801.14216-1-qin.long@intel.com> References: <20180412030801.14216-1-qin.long@intel.com> Subject: [PATCH v2 1/2] CryptoPkg/OpensslLib: Fix the documentation about submodule update X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2018 03:09:34 -0000 This patch is to drop "--remote" option from the original suggested submodule update command ("$ git submodule update --recursive --remote") in HOWTO document. "--remote" option will integrate changes from the upstream subproject with the submodules's "current HEAD", instead of using the edk2 superproject's "recorded SHA-1". It is wrong here for the edk2 consumers to updating the working tree of the submodules to match the commit / release tag that the superproject expects. Removing "--remote" option to fix the documentation issue here. Cc: Laszlo Ersek Cc: Ye Ting Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Long Qin --- CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt b/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt index ac63d4c077..36f8e711dd 100644 --- a/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt +++ b/CryptoPkg/Library/OpensslLib/OpenSSL-HOWTO.txt @@ -40,7 +40,7 @@ or And use the following combined commands to pull the remote submodule updates (e.g. Updating the new supported OpenSSL release tag): $ git pull --recurse-submodules && \ - git submodule update --recursive --remote + git submodule update --recursive ============================================================================= About process_files.pl -- 2.16.1.windows.1