From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::32b; helo=mail-wm1-x32b.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8FD8A2119AC24 for ; Mon, 10 Dec 2018 06:45:11 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id q26so11466946wmf.5 for ; Mon, 10 Dec 2018 06:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=IcUJ+vQusmA+IyGNjMXZc+MNqZPOKK6J6JryrLn5vn4=; b=X4u6snWsGCA7fXRcUYGClP91EIJolvnFGLs8N4QqdaclysMEnGXxmXV4ShJMXMOpX7 pyYHlOhuQZdk9c8PkvhXQclagrEq3vwrbTEChapgRXdw5O6sWukusE7jSRB4oZLCPG1w nXxeIKfyVrG3S8Fp0F2nGA61ddCCTLkwNFoaI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=IcUJ+vQusmA+IyGNjMXZc+MNqZPOKK6J6JryrLn5vn4=; b=h+bO9rp0gi/nNmNBkUSyETFsEBX3BIELaSTTMuwcJNmD+aqHMBlbP2S8vCstgF4HET uHzn9V8lNDS7OpdEfvfcsG1nO4xSQ8V/XI7odLmHtiHA4JQxY6hKOP4RLuJndqcRgySR rTgCdukowfIfGrR2EUx/T7ihXBg3FusFj3KTkGG8fwtUls052HKVNkbBoSVqYiyf7Hb4 HYhdnmgeeBgV/o+Tpg0F/amoosdRpVPjKFAxnxauKKqHmURhFpFrTuySYN+7gRVeavSA HLzQ8otYXdAl2gJKFclE3Bo8I7Mz7i8ZXsSRgqIXbtU1zamQjxDYBbwZI9eRB6JgyUFW aIag== X-Gm-Message-State: AA+aEWanReLSBde+Kom+3zJ2GIaHeMQxelcEvJKaVDMLsgx/tXrWkXpG UwhBdASXv+gYUNMVE2kjzpEP+Q== X-Google-Smtp-Source: AFSGD/Vkk60odVn0a/vTOUjKTTA2PjRrON3O/Mr2F7ZEjb+DVJQV83PQMtnOh0LXLygW4D6pagAW5Q== X-Received: by 2002:a1c:c148:: with SMTP id r69mr10875659wmf.147.1544453109599; Mon, 10 Dec 2018 06:45:09 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id c7sm15160218wre.64.2018.12.10.06.45.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 06:45:08 -0800 (PST) Date: Mon, 10 Dec 2018 14:45:07 +0000 From: Leif Lindholm To: "Gao, Liming" Cc: "Feng, Bob C" , "edk2-devel@lists.01.org" Message-ID: <20181210144507.34xxt26l34zwolm5@bivouac.eciton.net> References: <20181210011658.5212-1-bob.c.feng@intel.com> <20181210123012.cswf2pbzppqxff27@bivouac.eciton.net> <4A89E2EF3DFEDB4C8BFDE51014F606A14E3898BC@SHSMSX104.ccr.corp.intel.com> MIME-Version: 1.0 In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3898BC@SHSMSX104.ccr.corp.intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [Patch V2] BaseTools: Fixed the build fail issue for cases X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2018 14:45:12 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Dec 10, 2018 at 02:36:59PM +0000, Gao, Liming wrote: > Leif: > So, you don't think to need highlight which commit causes the > regression issue in the commit message. I suggest to put this > information into BZ description instead of commit message. Oh, I absolutely want the commit hash in the message. And ideally in a longer form, like Linux requires: 12-characters of hash followed by the subject of the faulty commit inside (""). But the format is just a question of taste, the information is what is important. If I happen to lose internet connection, I still want to be able to see which previous commit is being fixed by a patch. But it shouldn't come in the form: V2: ... V1: ... It should just form part of a coherent commit message. The development history of a patch is not interesting to the master branch of the repository. Regards, Leif > Thanks > Liming > > -----Original Message----- > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Leif Lindholm > > Sent: Monday, December 10, 2018 8:30 PM > > To: Feng, Bob C > > Cc: edk2-devel@lists.01.org; Gao, Liming > > Subject: Re: [edk2] [Patch V2] BaseTools: Fixed the build fail issue for cases > > > > Hi Bob, > > > > On Mon, Dec 10, 2018 at 09:16:58AM +0800, BobCF wrote: > > > From: "Feng, Bob C" > > > > > > V2: > > > > Patch version information does not belong in the commit message. > > It belongs in a cover letter, or if a cover letter is not used, you > > can put these details below the --- line. This way it gets filtered > > out by git. > > > > The patch commit message should end up being a description of what the > > patch is and does, not the development process that got us there. > > > > Regards, > > > > Leif > > > > > update the commit log. This issue is introduced by > > > the commit 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5 > > > > > > V1: > > > https://bugzilla.tianocore.org/show_bug.cgi?id=1386 > > > 1. There is no Pcd value assignment in Dsc file > > > 2. There are duplicate Pcd filed assignment > > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > Signed-off-by: Bob Feng > > > Cc: Liming Gao > > > --- > > > BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +- > > > BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py > > > index 008eee1a16..d02232b546 100644 > > > --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py > > > +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py > > > @@ -289,11 +289,11 @@ class StructurePcd(PcdClassObject): > > > if DefaultStoreName not in self.SkuOverrideValues[SkuName]: > > > self.SkuOverrideValues[SkuName][DefaultStoreName] = OrderedDict() > > > if DimensionAttr not in self.SkuOverrideValues[SkuName][DefaultStoreName]: > > > self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr] = collections.OrderedDict() > > > if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr]: > > > - del self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName][DimensionAttr] > > > + del self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] > > > self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] = [Value.strip(), FileName, LineNo] > > > return self.SkuOverrideValues[SkuName][DefaultStoreName][DimensionAttr][FieldName] > > > > > > def SetPcdMode (self, PcdMode): > > > self.PcdMode = PcdMode > > > diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py > > > index 4bd52619a9..eaedba0c12 100644 > > > --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py > > > +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py > > > @@ -1201,11 +1201,11 @@ class DscParser(MetaFileParser): > > > else: > > > self._ValueList = None > > > return > > > TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1) > > > self._CurrentPcdName = TokenList[0] > > > - if TokenList[1].strip().startswith("{CODE"): > > > + if len(TokenList) == 2 and TokenList[1].strip().startswith("{CODE"): > > > self._PcdDataTypeCODE = True > > > self._PcdCodeValue = TokenList[1].strip() > > > > > > if self._PcdDataTypeCODE: > > > if self._CurrentLine.endswith(")}"): > > > -- > > > 2.19.1.windows.1 > > > > > > _______________________________________________ > > > edk2-devel mailing list > > > edk2-devel@lists.01.org > > > https://lists.01.org/mailman/listinfo/edk2-devel > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel