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
28set -ev
29
30DTC_UPSTREAM_PATH=`pwd`/../dtc
31DTC_LINUX_PATH=`pwd`/scripts/dtc
32
33DTC_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"
36DTC_GENERATED="dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h"
37LIBFDT_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"
 
 
 
 
 
 
 
38
39# Build DTC
40cd $DTC_UPSTREAM_PATH
41make clean
42make check
 
 
 
43
44# Copy the files into the Linux tree
45cd $DTC_LINUX_PATH
46for f in $DTC_SOURCE; do
47	cp ${DTC_UPSTREAM_PATH}/${f} ${f}
48	git add ${f}
49done
50for f in $DTC_GENERATED; do
51	cp ${DTC_UPSTREAM_PATH}/$f ${f}_shipped
52	git add ${f}_shipped
53done
54for f in $LIBFDT_SOURCE; do
55       cp ${DTC_UPSTREAM_PATH}/libfdt/${f} libfdt/${f}
56       git add libfdt/${f}
57done
58
59sed -i -- 's/#include <libfdt_env.h>/#include "libfdt_env.h"/g' ./libfdt/libfdt.h
60sed -i -- 's/#include <fdt.h>/#include "fdt.h"/g' ./libfdt/libfdt.h
61git add ./libfdt/libfdt.h
62
63git commit -e -v -m "scripts/dtc: Update to upstream version [CHANGEME]"
 
 
 
 
 
 
 
 
 

 1#!/bin/sh
 2# SPDX-License-Identifier: GPL-2.0
 3# Simple script to update the version of DTC carried by the Linux kernel
 4#
 5# This script assumes that the dtc and the linux git trees are in the
 6# same directory. After building dtc in the dtc directory, it copies the
 7# source files and generated source file(s) into the scripts/dtc directory
 8# in the kernel and creates a git commit updating them to the new
 9# version.
10#
11# Usage: from the top level Linux source tree, run:
12# $ ./scripts/dtc/update-dtc-source.sh
13#
14# The script will change into the dtc tree, build and test dtc, copy the
15# relevant files into the kernel tree and create a git commit. The commit
16# message will need to be modified to reflect the version of DTC being
17# imported
18#
19# TODO:
20# This script is pretty basic, but it is seldom used so a few manual tasks
21# aren't a big deal. If anyone is interested in making it more robust, the
22# the following would be nice:
23# * Actually fail to complete if any testcase fails.
24#   - The dtc "make check" target needs to return a failure
25# * Extract the version number from the dtc repo for the commit message
26# * Build dtc in the kernel tree
27# * run 'make check" on dtc built from the kernel tree
28
29set -ev
30
31DTC_UPSTREAM_PATH=`pwd`/../dtc
32DTC_LINUX_PATH=`pwd`/scripts/dtc
33
34DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \
35		srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \
36		dtc-lexer.l dtc-parser.y"
37LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \
38		fdt_overlay.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c \
39		fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h"
40
41get_last_dtc_version() {
42	git log --oneline scripts/dtc/ | grep 'upstream' | head -1 | sed -e 's/^.* \(.*\)/\1/'
43}
44
45last_dtc_ver=$(get_last_dtc_version)
46
47# Build DTC
48cd $DTC_UPSTREAM_PATH
49make clean
50make check
51dtc_version=$(git describe HEAD)
52dtc_log=$(git log --oneline ${last_dtc_ver}..)
53
54
55# Copy the files into the Linux tree
56cd $DTC_LINUX_PATH
57for f in $DTC_SOURCE; do
58	cp ${DTC_UPSTREAM_PATH}/${f} ${f}
59	git add ${f}
60done
 
 
 
 
61for f in $LIBFDT_SOURCE; do
62       cp ${DTC_UPSTREAM_PATH}/libfdt/${f} libfdt/${f}
63       git add libfdt/${f}
64done
65
66sed -i -- 's/#include <libfdt_env.h>/#include "libfdt_env.h"/g' ./libfdt/libfdt.h
67sed -i -- 's/#include <fdt.h>/#include "fdt.h"/g' ./libfdt/libfdt.h
68git add ./libfdt/libfdt.h
69
70commit_msg=$(cat << EOF
71scripts/dtc: Update to upstream version ${dtc_version}
72
73This adds the following commits from upstream:
74
75${dtc_log}
76EOF
77)
78
79git commit -e -v -s -m "${commit_msg}"