Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scripts/dtc: Add a script to update to mainline dtc source

A very simple script that automates pulling in a newer version of DTC.
Not particularly robust, but a whole lot better than doing it by hand
every time.

Signed-off-by: Grant Likely <grant.likely@linaro.org>

+55 -1
+54
scripts/dtc/update-dtc-source.sh
··· 1 + #!/bin/sh 2 + # Simple script to update the version of DTC carried by the Linux kernel 3 + # 4 + # This script assumes that the dtc and the linux git trees are in the 5 + # same directory. After building dtc in the dtc directory, it copies the 6 + # source files and generated source files into the scripts/dtc directory 7 + # in the kernel and creates a git commit updating them to the new 8 + # version. 9 + # 10 + # Usage: from the top level Linux source tree, run: 11 + # $ ./scripts/dtc/update-dtc-source.sh 12 + # 13 + # The script will change into the dtc tree, build and test dtc, copy the 14 + # relevant files into the kernel tree and create a git commit. The commit 15 + # message will need to be modified to reflect the version of DTC being 16 + # imported 17 + # 18 + # TODO: 19 + # This script is pretty basic, but it is seldom used so a few manual tasks 20 + # aren't a big deal. If anyone is interested in making it more robust, the 21 + # the following would be nice: 22 + # * Actually fail to complete if any testcase fails. 23 + # - The dtc "make check" target needs to return a failure 24 + # * Extract the version number from the dtc repo for the commit message 25 + # * Build dtc in the kernel tree 26 + # * run 'make check" on dtc built from the kernel tree 27 + 28 + set -ev 29 + 30 + DTC_UPSTREAM_PATH=`pwd`/../dtc 31 + DTC_LINUX_PATH=`pwd`/scripts/dtc 32 + 33 + DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \ 34 + srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \ 35 + dtc-lexer.l dtc-parser.y" 36 + DTC_GENERATED="dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h" 37 + 38 + # Build DTC 39 + cd $DTC_UPSTREAM_PATH 40 + make clean 41 + make check 42 + 43 + # Copy the files into the Linux tree 44 + cd $DTC_LINUX_PATH 45 + for f in $DTC_SOURCE; do 46 + cp ${DTC_UPSTREAM_PATH}/${f} ${f} 47 + git add ${f} 48 + done 49 + for f in $DTC_GENERATED; do 50 + cp ${DTC_UPSTREAM_PATH}/$f ${f}_shipped 51 + git add ${f}_shipped 52 + done 53 + 54 + git commit -e -v -m "scripts/dtc: Update to upstream version [CHANGEME]"
+1 -1
scripts/dtc/version_gen.h
··· 1 - #define DTC_VERSION "DTC 1.4.0" 1 + #define DTC_VERSION "DTC 1.4.0-dirty"