From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVJNE-0000Tk-QO for qemu-devel@nongnu.org; Fri, 28 Aug 2015 09:07:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVJN8-000653-Nn for qemu-devel@nongnu.org; Fri, 28 Aug 2015 09:07:16 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:53405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVJN8-00062i-5G for qemu-devel@nongnu.org; Fri, 28 Aug 2015 09:07:10 -0400 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Aug 2015 23:07:07 +1000 Date: Fri, 28 Aug 2015 23:06:13 +1000 From: Gavin Shan Message-ID: <20150828130612.GA22643@gwshan> References: <1440746120-21577-1-git-send-email-gwshan@linux.vnet.ibm.com> <1440746120-21577-4-git-send-email-gwshan@linux.vnet.ibm.com> <55E04B17.5010605@redhat.com> <20150828123048.GA15305@gwshan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150828123048.GA15305@gwshan> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH v7 3/8] scripts: Submit changes while updating linux headers Reply-To: Gavin Shan List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gavin Shan Cc: Laurent Vivier , peter.maydell@linaro.org, thuth@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au On Fri, Aug 28, 2015 at 10:30:48PM +1000, Gavin Shan wrote: >On Fri, Aug 28, 2015 at 01:50:47PM +0200, Laurent Vivier wrote: >>On 28/08/2015 09:15, Gavin Shan wrote: >>> This submits changes with formatted commit log while updating Linux >>> headers using scripts/update-linux-headers.sh. >>> >>> Signed-off-by: Gavin Shan >>> --- >>> scripts/update-linux-headers.sh | 24 ++++++++++++++++++++++++ >>> 1 file changed, 24 insertions(+) >>> >>> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh >>> index 18daabe..1be02b8 100755 >>> --- a/scripts/update-linux-headers.sh >>> +++ b/scripts/update-linux-headers.sh >>> @@ -63,6 +63,28 @@ cp_virtio() { >>> fi >>> } >>> >>> +submit_change() { >>> + from=$1 >>> + to=$2 >>> + if ! [ -e $to/include/qemu-common.h ]; then >>> + echo "$to not QEMU source directory, skip submitting changes" >>> + exit 3 >>> + fi >>> + >>> + version=$(make -C $from -s kernelversion) >>> + commit=$(cd $from && git log --oneline -1 | cut -d " " -f 1) >> >>it's a detail, but you can use directly: git log --format="%h" -1 >> > >Yeah, I don't need another "cut" here with powerful "git log --format". >Will adjust in next revision. By the way, it seems one message suggested >by Peter is still missed, I'll add it: > >This commit was created automatically by update-linux-headers.sh. > >>> + subject="Synchronize Linux headers from kernel $version" >>> + message="Synchronize the Linux headers from kernel version $version" >>> + message=$(echo "$message\n(commit $commit)") >>> + res=$(cd $to && git commit -qa -m "$subject" -m "$message" -s && echo $?) >>> + if [ "$res" = "0" ]; then >> >>another detail, but you should be able to do something like: >> >> if git commit -C $to -qa -m "$subject" -m "$message" -s ; then >> > >I didn't figure out the option to switch to target directory from the >manpage. would you mind telling the option? > Maybe you suggested to use something like below? In that case, "$res" can be dropped. if cd $to && git commit -qa -m "$message" -s ; then echo "Changes submitted successfully" else echo "Failure submitting changes" exit 4 fi >>> + echo "Changes submitted successfully" >>> + else >>> + echo "Error $res submitting changes" >>> + exit 4 >>> + fi >>> +} >>> + >>> # This will pick up non-directories too (eg "Kconfig") but we will >>> # ignore them in the next loop. >>> ARCHLIST=$(cd "$linux/arch" && echo *) >>> @@ -132,3 +154,5 @@ cat <$output/include/standard-headers/linux/if_ether.h >>> EOF >>> >>> rm -rf "$tmpdir" >>> + >>> +submit_change "$linux" "$output" >>> Thanks, Gavin