From 9c0169d4907c6a0e3b4e3d3c27f5fcbd657cfe10 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Fri, 15 Oct 2021 09:35:35 +0200
Subject: [PATCH] linux-oniro: Update branches after rename
Branch rename has happened in upstream repository now. Adjust the names
to follow.
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
meta-ohos-core/recipes-kernel/linux/linux-oniro_5.10.bb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta-ohos-core/recipes-kernel/linux/linux-oniro_5.10.bb b/meta-ohos-core/recipes-kernel/linux/linux-oniro_5.10.bb
index ccfa620d..6d5d846f 100644
--- a/meta-ohos-core/recipes-kernel/linux/linux-oniro_5.10.bb
+++ b/meta-ohos-core/recipes-kernel/linux/linux-oniro_5.10.bb
@@ -2,21 +2,20 @@
#
# SPDX-License-Identifier: Apache-2.0
-# FIXME RENAME branch name need to change in upstream repo
-KBRANCH ?= "asos/v5.10/base"
+KBRANCH ?= "oniro/v5.10/base"
KMETA = "kernel-meta"
require recipes-kernel/linux/linux-yocto.inc
# board-specific branches
-KBRANCH_qemuarm ?= "asos/v5.10/hw/qemuarm"
+KBRANCH_qemuarm ?= "oniro/v5.10/hw/qemuarm"
SRCREV_machine_qemuarm ?= "b8d9461a3957dba555b1ae82481cf57f3ce9e8b1"
SRCREV_machine ?= "452ea6a15ed2ac74789b7b3513777cc94ea3b751"
SRCREV_meta ?= "3b283fa8d4068ff68457b93e07d321c6c06d37e0"
SRC_URI = "git://git.ostc-eu.org/OSTC/OHOS/components/kernel/linux.git;protocol=http;name=machine;branch=${KBRANCH}; \
- git://git.ostc-eu.org/OSTC/OHOS/components/kernel/linux-meta.git;type=kmeta;protocol=http;name=meta;branch=asos/v5.10;destsuffix=${KMETA}"
+ git://git.ostc-eu.org/OSTC/OHOS/components/kernel/linux-meta.git;type=kmeta;protocol=http;name=meta;branch=oniro/v5.10;destsuffix=${KMETA}"
require recipes-kernel/linux/linux-oniro-tweaks-all.inc
--
GitLab