From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40745)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lvivier@redhat.com>) id 1ZVIBM-0000Fk-3D
	for qemu-devel@nongnu.org; Fri, 28 Aug 2015 07:50:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lvivier@redhat.com>) id 1ZVIBH-0008Mb-44
	for qemu-devel@nongnu.org; Fri, 28 Aug 2015 07:50:56 -0400
References: <1440746120-21577-1-git-send-email-gwshan@linux.vnet.ibm.com>
	<1440746120-21577-4-git-send-email-gwshan@linux.vnet.ibm.com>
From: Laurent Vivier <lvivier@redhat.com>
Message-ID: <55E04B17.5010605@redhat.com>
Date: Fri, 28 Aug 2015 13:50:47 +0200
MIME-Version: 1.0
In-Reply-To: <1440746120-21577-4-git-send-email-gwshan@linux.vnet.ibm.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH v7 3/8] scripts: Submit changes
 while updating linux headers
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gavin Shan <gwshan@linux.vnet.ibm.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, thuth@redhat.com, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au



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 <gwshan@linux.vnet.ibm.com>
> ---
>  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

> +    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

> +        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 <<EOF >$output/include/standard-headers/linux/if_ether.h
>  EOF
>  
>  rm -rf "$tmpdir"
> +
> +submit_change "$linux" "$output"
>