diff --git a/recipes-openharmony/openharmony/openharmony-standard-sources-3.0.inc b/recipes-openharmony/openharmony/openharmony-standard-sources-3.0.inc index c33f1a8cc9da6e6cb51f0e6b8bb2c6b1cb4d214d..e96c1bffe4321b9b6c458849053d768735842bdf 100644 --- a/recipes-openharmony/openharmony/openharmony-standard-sources-3.0.inc +++ b/recipes-openharmony/openharmony/openharmony-standard-sources-3.0.inc @@ -421,9 +421,6 @@ SRCREV_FORMAT .= "+third_party_wpa_supplicant" SRC_URI += "${GITEE_URL}/third_party_xkeyboardconfig.git;protocol=https;nobranch=1;branch=OpenHarmony-v3.0.1-LTS;name=third_party_xkeyboardconfig;destsuffix=${OH_SRCDIR}/third_party/XKeyboardConfig" SRCREV_third_party_xkeyboardconfig = "0a9a2de029183789a6d87f7add90d2e81f594adc" SRCREV_FORMAT .= "+third_party_xkeyboardconfig" -SRC_URI += "${GITEE_URL}/third_party_zlib.git;protocol=https;nobranch=1;branch=OpenHarmony-v3.0.1-LTS;name=third_party_zlib;destsuffix=${OH_SRCDIR}/third_party/zlib" -SRCREV_third_party_zlib = "30155e711e4949ad61c48fc9cf357a0d316b3133" -SRCREV_FORMAT .= "+third_party_zlib" SRC_URI += "${GITEE_URL}/utils.git;protocol=https;nobranch=1;branch=OpenHarmony-v3.0.1-LTS;name=utils;destsuffix=${OH_SRCDIR}/utils" SRCREV_utils = "061ca56baf4817fb43d1e151734ac0903ed66b02" SRCREV_FORMAT .= "+utils" diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb index 618324c2b7f6dfcce4813d4ebd46ac57695e2407..9b84829c2b4dcb6f3afe19dda8f468fb1c7ae9b0 100644 --- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb +++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb @@ -454,7 +454,7 @@ FILES:${PN}-hilog = " \ ${sysconfdir}/openharmony/hilog*.conf \ ${systemd_unitdir}/hilogd.service \ " -RDEPENDS:${PN}-hilog += "musl libcxx" +RDEPENDS:${PN}-hilog += "musl libcxx zlib" RDEPENDS:${PN}-hilog += "${PN}-libutilsecurec" RDEPENDS:${PN} += "${PN}-hilog" @@ -533,7 +533,7 @@ FILES:${PN}-appexecfwk = "\ ${libdir}/module/libnapi_app_mgr*${SOLIBS} \ ${libdir}/openharmony/profile/foundation.xml \ " -RDEPENDS:${PN}-appexecfwk += "musl libcxx" +RDEPENDS:${PN}-appexecfwk += "musl libcxx zlib" RDEPENDS:${PN}-appexecfwk += "${PN}-libutils ${PN}-hilog ${PN}-samgr ${PN}-ipc ${PN}-appverify ${PN}-distributeddatamgr ${PN}-notification-ces" RDEPENDS:${PN}-appexecfwk += "${PN}-security-permission ${PN}-appspawn ${PN}-safwk ${PN}-timeservice ${PN}-powermgr ${PN}-dmsfwk ${PN}-resmgr" RDEPENDS:${PN}-appexecfwk += "${PN}-aafwk ${PN}-ace-napi" @@ -598,7 +598,7 @@ FILES:${PN}-aafwk = " \ ${libdir}/module/app/libabilitymanager*${SOLIBS} \ ${libdir}/module/libzlib*${SOLIBS} \ " -RDEPENDS:${PN}-aafwk += "musl libcxx" +RDEPENDS:${PN}-aafwk += "musl libcxx minizip" RDEPENDS:${PN}-aafwk += "${PN}-appexecfwk ${PN}-samgr ${PN}-libutils ${PN}-ipc ${PN}-appdatamgr ${PN}-dmsfwk ${PN}-resmgr ${PN}-security-permission" RDEPENDS:${PN}-aafwk += "${PN}-safwk ${PN}-notification-ces ${PN}-multimodalinput ${PN}-thirdparty-jsoncpp ${PN}-graphic ${PN}-hilog ${PN}-ace-napi" RDEPENDS:${PN} += "${PN}-aafwk" @@ -802,7 +802,7 @@ FILES:${PN}-resmgr = " \ ${libdir}/libglobal_resmgr*${SOLIBS} \ ${libdir}/module/libresourcemanager*${SOLIBS} \ " -RDEPENDS:${PN}-resmgr += "musl libcxx ${PN}-thirdparty-icu ${PN}-hilog ${PN}-aafwk ${PN}-ipc ${PN}-dmsfwk ${PN}-libutils ${PN}-ace-napi" +RDEPENDS:${PN}-resmgr += "musl libcxx minizip ${PN}-thirdparty-icu ${PN}-hilog ${PN}-aafwk ${PN}-ipc ${PN}-dmsfwk ${PN}-libutils ${PN}-ace-napi" RDEPENDS:${PN} += "${PN}-resmgr" PACKAGES =+ "${PN}-resmgr-ptest" @@ -1242,7 +1242,7 @@ FILES:${PN}-ace-engine = " \ ${libdir}/module/libmediaquery*${SOLIBS} \ ${libdir}/module/librouter*${SOLIBS} \ " -RDEPENDS:${PN}-ace-engine += "musl libcxx libcrypto libssl" +RDEPENDS:${PN}-ace-engine += "musl libcxx libcrypto libssl zlib" RDEPENDS:${PN}-ace-engine += "${PN}-ace-napi ${PN}-dmsfwk ${PN}-ipc ${PN}-libutils ${PN}-appexecfwk ${PN}-appdatamgr" RDEPENDS:${PN}-ace-engine += "${PN}-thirdparty-icu ${PN}-resmgr ${PN}-aafwk ${PN}-multimodalinput ${PN}-syspara ${PN}-hisysevent" RDEPENDS:${PN}-ace-engine += "${PN}-ark-runtime-core ${PN}-hilog ${PN}-js-worker ${PN}-i18n ${PN}-graphic ${PN}-bytrace" @@ -1324,7 +1324,7 @@ do_install:append() { install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/weston.service ${D}${systemd_unitdir}/system/ } -RDEPENDS:${PN}-graphic += "musl libcxx" +RDEPENDS:${PN}-graphic += "musl libcxx zlib" RDEPENDS:${PN}-graphic += "${PN}-multimodalinput ${PN}-hilog ${PN}-libutils ${PN}-thirdparty-weston ${PN}-thirdparty-wayland ${PN}-thirdparty-libffi ${PN}-thirdparty-libinput" RDEPENDS:${PN}-graphic += "${PN}-graphic ${PN}-multimedia-media ${PN}-ipc ${PN}-display-gralloc ${PN}-samgr ${PN}-thirdparty-libdrm ${PN}-thirdparty-libevdev" RDEPENDS:${PN}-graphic += "${PN}-appexecfwk ${PN}-distributeddatamgr ${PN}-dmsfwk ${PN}-ace-napi" @@ -1351,7 +1351,7 @@ FILES:${PN}-bytrace = " \ ${libdir}/libbytrace_core*${SOLIBS} \ ${libdir}/module/libbytrace*${SOLIBS} \ " -RDEPENDS:${PN}-bytrace += "musl libcxx" +RDEPENDS:${PN}-bytrace += "musl libcxx zlib" RDEPENDS:${PN}-bytrace += "${PN}-syspara ${PN}-libutils ${PN}-ace-napi" RDEPENDS:${PN} += "${PN}-bytrace" @@ -1842,7 +1842,7 @@ FILES:${PN}-thirdparty-gstreamer = " \ ${libdir}/media/plugins/libgstcoreelements*${SOLIBS} \ ${libdir}/media/plugins/libgstcoretracers*${SOLIBS} \ " -RDEPENDS:${PN}-thirdparty-gstreamer += "musl libcxx" +RDEPENDS:${PN}-thirdparty-gstreamer += "musl libcxx zlib" RDEPENDS:${PN}-thirdparty-gstreamer += "${PN}-thirdparty-glib ${PN}-thirdparty-ffmpeg" RDEPENDS:${PN} += "${PN}-thirdparty-gstreamer" @@ -1893,7 +1893,7 @@ RDEPENDS:${PN} += "${PN}-thirdparty-libdrm" PACKAGES =+ "${PN}-thirdparty-libpng" FILES:${PN}-thirdparty-libpng = "${libdir}/libpng*${SOLIBS}" -RDEPENDS:${PN}-thirdparty-libpng += "musl libcxx" +RDEPENDS:${PN}-thirdparty-libpng += "musl libcxx zlib" RDEPENDS:${PN}-thirdparty-libpng += "${PN}-multimedia-image ${PN}-libutils ${PN}-hilog" RDEPENDS:${PN} += "${PN}-thirdparty-libpng"