From f43e8a74ae7149f616e7b865eb3d7ab572c2a281 Mon Sep 17 00:00:00 2001
From: Thierry Escande <thierry.escande@huawei.com>
Date: Tue, 31 May 2022 16:09:00 +0200
Subject: [PATCH] musl: Move patch files to openharmony-3.0 directory
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
---
recipes-core/musl/musl_%.bbappend | 2 +-
.../musl/{files => openharmony-3.0}/openharmony-common.patch | 0
.../openharmony-linux-user-capability_h.patch | 0
.../{files => openharmony-3.0}/openharmony-linux-user.patch | 0
4 files changed, 1 insertion(+), 1 deletion(-)
rename recipes-core/musl/{files => openharmony-3.0}/openharmony-common.patch (100%)
rename recipes-core/musl/{files => openharmony-3.0}/openharmony-linux-user-capability_h.patch (100%)
rename recipes-core/musl/{files => openharmony-3.0}/openharmony-linux-user.patch (100%)
diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend
index 3fac6222..cc369138 100644
--- a/recipes-core/musl/musl_%.bbappend
+++ b/recipes-core/musl/musl_%.bbappend
@@ -5,7 +5,7 @@
BASEVER:oniro-openharmony-linux = "1.2.0"
SRCREV:oniro-openharmony-linux = "040c1d16b468c50c04fc94edff521f1637708328"
LIC_FILES_CHKSUM:oniro-openharmony-linux = "file://COPYRIGHT;md5=f95ee848a08ad253c04723da00cedb01"
-FILESEXTRAPATHS:prepend:oniro-openharmony-linux := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:oniro-openharmony-linux := "${THISDIR}/openharmony-${OPENHARMONY_VERSION}:"
SRC_URI:append:oniro-openharmony-linux = " file://openharmony-common.patch"
SRC_URI:append:oniro-openharmony-linux = " file://openharmony-linux-user.patch"
# This conflicts with libcap, so we have to go with libcap instead
diff --git a/recipes-core/musl/files/openharmony-common.patch b/recipes-core/musl/openharmony-3.0/openharmony-common.patch
similarity index 100%
rename from recipes-core/musl/files/openharmony-common.patch
rename to recipes-core/musl/openharmony-3.0/openharmony-common.patch
diff --git a/recipes-core/musl/files/openharmony-linux-user-capability_h.patch b/recipes-core/musl/openharmony-3.0/openharmony-linux-user-capability_h.patch
similarity index 100%
rename from recipes-core/musl/files/openharmony-linux-user-capability_h.patch
rename to recipes-core/musl/openharmony-3.0/openharmony-linux-user-capability_h.patch
diff --git a/recipes-core/musl/files/openharmony-linux-user.patch b/recipes-core/musl/openharmony-3.0/openharmony-linux-user.patch
similarity index 100%
rename from recipes-core/musl/files/openharmony-linux-user.patch
rename to recipes-core/musl/openharmony-3.0/openharmony-linux-user.patch
--
GitLab