From ff15c49b626c85b8586016ba751285fb5a714c3e Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 26 Apr 2022 13:49:36 +0200 Subject: [PATCH] Update master branch to YP 4.0 aka kirkstone Thanks to the continuous updates from Scott on the next branch, we can uprev directly when kirkstone is about to be released. In this step we do uprev the AGL-repo to what is in our 'next' branch. Then we will update the meta-agl* layers and change the default back to master. Bug-AGL: SPEC-4343 Signed-off-by: Jan-Simon Moeller Change-Id: I52b87c21be95bafa0813f6388211073ae2b8d35b --- default-floating.xml | 37 ++++++++++++++++++++----------------- default.xml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/default-floating.xml b/default-floating.xml index ee491ba7..0cbab1b8 100644 --- a/default-floating.xml +++ b/default-floating.xml @@ -12,7 +12,7 @@ - + @@ -30,33 +30,33 @@ - - - + + + - + - + - + - + - + - + @@ -68,25 +68,28 @@ - + - - + + - - + + - + - + + + + diff --git a/default.xml b/default.xml index f8cce0a2..20930efa 100644 --- a/default.xml +++ b/default.xml @@ -12,7 +12,7 @@ - + @@ -29,66 +29,66 @@ - - - + + + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + -- 2.16.6