diff options
author | Yongqin Liu <yongqin.liu@linaro.org> | 2020-06-16 12:47:25 +0800 |
---|---|---|
committer | Yongqin Liu <yongqin.liu@linaro.org> | 2020-06-16 12:47:25 +0800 |
commit | 7a4f8774756334dc4b01d909f59bcfa2f2c840a8 (patch) | |
tree | 66df4262e83479e5bdf8bdd543b243026f8c82f9 /lkft-hikey-merge-mirrors.yaml | |
parent | 536a3bc21f4683da9fdfded58de4e628d7d03cdb (diff) |
lkft-hikey-merge-mirrors.yaml: support for merge from kernel/common repository
for the android-4.14-stable, android-4.19, and android-4.19-stable branches
Change-Id: I387456927ff98a59d8ada3efe5aab67c44c99176
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Diffstat (limited to 'lkft-hikey-merge-mirrors.yaml')
-rw-r--r-- | lkft-hikey-merge-mirrors.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lkft-hikey-merge-mirrors.yaml b/lkft-hikey-merge-mirrors.yaml index 398102f0c9..2eba6ef471 100644 --- a/lkft-hikey-merge-mirrors.yaml +++ b/lkft-hikey-merge-mirrors.yaml @@ -64,13 +64,13 @@ git config --global user.email "ci-bot@linaro.org" case "X${KERNEL_BRANCH}" in - "Xmirror-android-4.14-stable") + "Xmirror-android-4.14-stable"|"Xandroid-4.14-stable") target_branch="android-hikey-linaro-4.14-stable-lkft" ;; - "Xmirror-android-4.19") + "Xmirror-android-4.19"|"android-4.19") target_branch="android-hikey-linaro-4.19-lkft" ;; - "Xmirror-android-4.19-stable") + "Xmirror-android-4.19-stable"|"Xandroid-4.19-stable") target_branch="android-hikey-linaro-4.19-stable-lkft" ;; "X*") |