blob: a57b78a41d345a164368a8fa3803115ae0a8e73c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright 2024 Linaro Ltd.
#
# Usage: from the top level U-Boot source tree, run:
# $ ./dts/update-dts-subtree.sh pull <release-tag>
# $ ./dts/update-dts-subtree.sh pick <commit-id>
#
# The script will pull changes from devicetree-rebasing repo into U-Boot
# as a subtree located as <U-Boot>/dts/upstream sub-directory. It will
# automatically create a squash/merge commit listing the commits imported.
set -e
merge_commit_msg=$(cat << EOF
Subtree merge tag '$2' of devicetree-rebasing repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
EOF
)
remote_add_and_fetch() {
if ! git remote get-url devicetree-rebasing 2>/dev/null
then
echo "Warning: Script automatically adds new git remote via:"
echo " git remote add devicetree-rebasing \\"
echo " https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git"
git remote add devicetree-rebasing \
https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
fi
git fetch devicetree-rebasing master
}
if [ "$1" = "pull" ]
then
remote_add_and_fetch
git subtree pull --prefix dts/upstream devicetree-rebasing \
"$2" --squash -m "${merge_commit_msg}"
elif [ "$1" = "pick" ]
then
remote_add_and_fetch
git cherry-pick -x --strategy=subtree -Xsubtree=dts/upstream/ "$2"
else
echo "usage: $0 <op> <ref>"
echo " <op> pull or pick"
echo " <ref> release tag [pull] or commit id [pick]"
fi
|
