From b3201db36bf559bf668e459ac69c98e7d2a5b371 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Thu, 18 Feb 2021 15:46:14 +0100
Subject: [PATCH] ohos-xts-acts: switch to current ostc branch
All of the staging components are moving to a model where the master
branch follows upstream open harmony gitee repository and the ostc
branch is re-based on that master, and contains additional patches.
The zmk patch was applied at the "local" upstream (ostc branch), so drop
if from the recipe.
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
.../0001-Add-makefile-based-on-zmk.patch | 56 -------------------
.../ohos-xts-acts/ohos-xts-acts_git.bb | 6 +-
2 files changed, 2 insertions(+), 60 deletions(-)
delete mode 100644 meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts/0001-Add-makefile-based-on-zmk.patch
diff --git a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts/0001-Add-makefile-based-on-zmk.patch b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts/0001-Add-makefile-based-on-zmk.patch
deleted file mode 100644
index 73240cd0..00000000
--- a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts/0001-Add-makefile-based-on-zmk.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6d6cd9463f97ab8e021798bd313655fad5802179 Mon Sep 17 00:00:00 2001
-From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
-Date: Thu, 28 Jan 2021 14:25:09 +0100
-Subject: [PATCH] Add makefile based on zmk
-
-The makefile defines ActsDacTest.bin
-
-Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
----
- GNUmakefile | 37 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
- create mode 100644 GNUmakefile
-
-diff --git a/GNUmakefile b/GNUmakefile
-new file mode 100644
-index 0000000..6a7a2d8
---- /dev/null
-+++ b/GNUmakefile
-@@ -0,0 +1,37 @@
-+# SPDX-License-Identifier: Apache-2.0
-+#
-+# Copyright 2021 Huawei Inc.
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+# http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+include z.mk
-+
-+Project.Name=ohos-xts-acts
-+Project.Version=1
-+
-+$(eval $(call ZMK.Import,Configure))
-+
-+ActsDacTest.bin: CPPFLAGS += -iquote $(ZMK.OutOfTreeSourcePath)security_lite/permission_posix/dac/src
-+# Incorrect platform macros used throughout harmony code.
-+ActsDacTest.bin: CPPFLAGS += -D__LINUX__
-+# See corresponding BUILD.gn
-+ActsDacTest.bin: CFLAGS += -Wno-error
-+
-+ActsDacTest.bin.Sources = $(addprefix security_lite/permission_posix/dac/src/, \
-+ ActsDacPreTest.cpp \
-+ ActsDacTest.cpp \
-+ ActsDacTest.h \
-+ ActsSystemDevDacTest.cpp \
-+ ActsSystemJffsDacTest.cpp)
-+ActsDacTest.bin: LDLIBS += -lgtest -lgtest_main -lpthread -lsec
-+$(eval $(call ZMK.Expand,Program.Test,ActsDacTest.bin))
diff --git a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
index 0a5f9d2e..6a2795d5 100644
--- a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
+++ b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
@@ -1,10 +1,8 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=98c2e72b17fae6c40fb14fd5e43b29ec"
-SRC_URI = "git://git.ostc-eu.org/OSTC/OHOS/components/staging/xts_acts.git;protocol=https \
- file://0001-Add-makefile-based-on-zmk.patch \
- "
-SRCREV = "2a3e429e72f8612e74a7d1e32567be11ef1541c4"
+SRC_URI = "git://git.ostc-eu.org/OSTC/OHOS/components/staging/xts_acts.git;protocol=https;branch=ostc"
+SRCREV = "8a797c4ee9bf451e030430bbd73293ee8e0fe54d"
S = "${WORKDIR}/git"
PV = "0.0+git${SRCPV}"
--
GitLab