#!/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 # $ ./dts/update-dts-subtree.sh pick # # The script will pull changes from devicetree-rebasing repo into U-Boot # as a subtree located as /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 " echo " pull or pick" echo " release tag [pull] or commit id [pick]" fi