diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-03-28 10:26:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-03-28 10:26:27 +0200 |
| commit | 610797b376e65475f7aed1218a085ff8701da474 (patch) | |
| tree | e00f13b7005df77938a0d2744e7fdbca6c3b063e /dts/scripts | |
| parent | 4503182db2ec316eec165d2c75ca336ad22a4ff4 (diff) | |
| download | barebox-610797b376e65475f7aed1218a085ff8701da474.tar.gz barebox-610797b376e65475f7aed1218a085ff8701da474.tar.xz | |
dts: update to v5.17
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/scripts')
| -rwxr-xr-x | dts/scripts/cronjob | 2 | ||||
| -rwxr-xr-x | dts/scripts/filter.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/dts/scripts/cronjob b/dts/scripts/cronjob index ccdbc0607e..f01166b8e4 100755 --- a/dts/scripts/cronjob +++ b/dts/scripts/cronjob @@ -84,7 +84,7 @@ TESTBRANCH=test-${DATE} MERGE_OUTPUT=`( set -e git checkout -b ${TESTBRANCH} origin/master -git merge --no-edit upstream/dts +git -c merge.renameLimit=1000000 merge --no-edit upstream/dts ) 2>&1 ` REF=$(git show-ref --verify refs/heads/${TESTBRANCH}) echo "Testing: ${REF}" diff --git a/dts/scripts/filter.sh b/dts/scripts/filter.sh index e1f6bac298..5e10ff4177 100755 --- a/dts/scripts/filter.sh +++ b/dts/scripts/filter.sh @@ -6,6 +6,8 @@ set -e export SCRIPTS=$(dirname $(readlink -f $0)) +export FILTER_BRANCH_SQUELCH_WARNING=1 + UPSTREAM_MASTER=upstream/master UPSTREAM_REWRITTEN=upstream/dts |