From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [RC Fixes 01/19] scripts/combo-layer: fix still overzealous regex in default hook script
Date: Wed, 21 Sep 2011 02:39:17 -0700 [thread overview]
Message-ID: <b7ddebfe01a59638bf9db0c689a06218ad31b458.1316597628.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1316597628.git.sgw@linux.intel.com>
In-Reply-To: <cover.1316597628.git.sgw@linux.intel.com>
From: Paul Eggleton <paul.eggleton@linux.intel.com>
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 <paul.eggleton@linux.intel.com>
---
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
next prev parent reply other threads:[~2011-09-21 9:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
2011-09-21 9:39 ` Saul Wold [this message]
2011-09-21 9:39 ` [RC Fixes 02/19] deb packages support: switch from /var/dpkg to /var/lib/dpkg Saul Wold
2011-09-21 9:39 ` [RC Fixes 03/19] libzypp: git repo moved to github Saul Wold
2011-09-21 9:39 ` [RC Fixes 04/19] sat-solver: " Saul Wold
2011-09-21 9:39 ` [RC Fixes 05/19] zypper: " Saul Wold
2011-09-21 9:39 ` [RC Fixes 06/19] distrodata: fix distro_check code Saul Wold
2011-09-21 9:39 ` [RC Fixes 07/19] distro tracking: Update Distro Aliases Saul Wold
2011-09-21 10:35 ` Koen Kooi
2011-09-21 9:39 ` [RC Fixes 08/19] avahi: Refactor recipe to move UI to avahi-ui Saul Wold
2011-09-21 9:39 ` [RC Fixes 09/19] rpm: add multilib prefix for archs under deploy/rpm Saul Wold
2011-09-21 9:39 ` [RC Fixes 10/19] multilib: install MULTILIB_IMAGE_INSTALL Saul Wold
2011-09-21 9:39 ` [RC Fixes 11/19] Fix RPM dependencies Saul Wold
2011-09-21 9:39 ` [RC Fixes 12/19] Add a run-time dependency that eglibc support GNU_HASH Saul Wold
2011-09-21 9:39 ` [RC Fixes 13/19] Update python dependencies to be simply to "python" Saul Wold
2011-09-21 9:39 ` [RC Fixes 14/19] busybox: Enhance to add dynamic per-file provides Saul Wold
2011-09-21 9:39 ` [RC Fixes 15/19] multilib_global.bbclass: Fix non-multilib package provides Saul Wold
2011-09-21 9:39 ` [RC Fixes 16/19] Fix alsa-utils package dependencies Saul Wold
2011-09-21 9:39 ` [RC Fixes 17/19] oprofileui: Change avahi to avahi-ui depends Saul Wold
2011-09-21 9:39 ` [RC Fixes 18/19] libpng: avoid dangling link in libpng package Saul Wold
2011-09-21 9:39 ` [RC Fixes 19/19] libpng: add libpng12-dev packages Saul Wold
2011-09-21 12:44 ` [RC Fixes 00/19] Fixes for Multi-Lib & other patches Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b7ddebfe01a59638bf9db0c689a06218ad31b458.1316597628.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox