From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1R6JMO-0008DE-H6 for openembedded-core@lists.openembedded.org; Wed, 21 Sep 2011 11:44:56 +0200 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 21 Sep 2011 02:39:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="51195242" Received: from unknown (HELO swold-mobl.bigsur.com) ([10.255.14.170]) by orsmga002.jf.intel.com with ESMTP; 21 Sep 2011 02:39:36 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Wed, 21 Sep 2011 02:39:17 -0700 Message-Id: X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [RC Fixes 01/19] scripts/combo-layer: fix still overzealous regex in default hook script X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Sep 2011 09:44:56 -0000 From: Paul Eggleton In the previous fix to this hook script (OE core revision e7aae45414e4597e9244f86a81fbc940f73785c8) a start-of-line (^) marker was missed, so if a commit had no Signed-off-by line but it contained an inner patch that did, the inner patch was modified causing a "corrupt patch" error. Signed-off-by: Paul Eggleton --- scripts/combo-layer-hook-default.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh index e535d5f..8b148ac 100755 --- a/scripts/combo-layer-hook-default.sh +++ b/scripts/combo-layer-hook-default.sh @@ -10,4 +10,4 @@ rev=$2 reponame=$3 sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile -sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile +sed -i -e "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile -- 1.7.6