Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1605782

[PATCH 1/3] scripts/dtc: automate getting dtc version and log in update script

Show all headers | View raw

Further automate the dtc update script to fill in the dtc version and
commit log.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 scripts/dtc/update-dtc-source.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/dtc/update-dtc-source.sh b/scripts/dtc/update-dtc-source.sh
index f5cde799db03..c92e6bd9458d 100755
--- a/scripts/dtc/update-dtc-source.sh
+++ b/scripts/dtc/update-dtc-source.sh
@@ -36,10 +36,19 @@ DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c
 DTC_GENERATED="dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h"
 LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_empty_tree.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h"
 
+get_last_dtc_version() {
+	git log --oneline scripts/dtc/ | grep 'upstream' | head -1 | sed -e 's/^.* \(.*\)/\1/'
+}
+
+last_dtc_ver=$(get_last_dtc_version)
+
 # Build DTC
 cd $DTC_UPSTREAM_PATH
 make clean
 make check
+dtc_version=$(git describe HEAD)
+dtc_log=$(git log --oneline ${last_dtc_ver}..)
+
 
 # Copy the files into the Linux tree
 cd $DTC_LINUX_PATH
@@ -60,4 +69,12 @@ sed -i -- 's/#include <libfdt_env.h>/#include "libfdt_env.h"/g' ./libfdt/libfdt.
 sed -i -- 's/#include <fdt.h>/#include "fdt.h"/g' ./libfdt/libfdt.h
 git add ./libfdt/libfdt.h
 
-git commit -e -v -m "scripts/dtc: Update to upstream version [CHANGEME]"
+commit_msg=$(cat << EOF
+scripts/dtc: Update to upstream version ${dtc_version}
+
+This adds the following commits from upstream:
+
+${dtc_log}
+EOF
+)
+git commit -e -v -s -m "${commit_msg}"
-- 
2.10.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] dtc updates for 4.12 Rob Herring <robh@kernel.org> - 2017-03-21 17:30 +0100
  [PATCH 3/3] dtc: update warning settings for new bus and node/property name checks Rob Herring <robh@kernel.org> - 2017-03-21 17:30 +0100
  [PATCH 1/3] scripts/dtc: automate getting dtc version and log in update script Rob Herring <robh@kernel.org> - 2017-03-21 17:30 +0100
  Re: [PATCH 0/3] dtc updates for 4.12 Florian Fainelli <f.fainelli@gmail.com> - 2017-03-21 18:00 +0100
    Re: [PATCH 0/3] dtc updates for 4.12 Rob Herring <robh@kernel.org> - 2017-03-21 20:40 +0100
  Re: [PATCH 0/3] dtc updates for 4.12 Olof Johansson <olof@lixom.net> - 2017-03-21 20:20 +0100
    Re: [PATCH 0/3] dtc updates for 4.12 Rob Herring <robh@kernel.org> - 2017-03-21 21:10 +0100

csiph-web