Skip to content
Snippets Groups Projects
Commit 31d84409 authored by Thierry Escande's avatar Thierry Escande
Browse files

openharmony-standard-3.1: Fix file-rdeps errors


This adds the missing OpenHarmony parts to be installed into the system
image and fixes the RDEPENDS errors. The INSANE_SKIP for file-rdeps can
be then removed.

Signed-off-by: default avatarThierry Escande <thierry.escande@huawei.com>
parent 1ec09b37
No related branches found
No related tags found
1 merge request!30Fix OpenHarmony 3.1 file-rdeps errors
Pipeline #5989 passed
...@@ -206,6 +206,8 @@ do_install () { ...@@ -206,6 +206,8 @@ do_install () {
# Workaround! Build system does not install libcrypto.z.so (boringssl), so # Workaround! Build system does not install libcrypto.z.so (boringssl), so
# we install it manually for now # we install it manually for now
cp ${B}/developtools/profiler/libcrypto.z.so ${D}${libdir}/ cp ${B}/developtools/profiler/libcrypto.z.so ${D}${libdir}/
# Same for libusb_shared.z.so
cp ${B}/common/common/libusb_shared.z.so ${D}${libdir}/
} }
inherit update-alternatives inherit update-alternatives
...@@ -311,6 +313,8 @@ OPENHARMONY_PARTS += "developtools:bytrace_standard" ...@@ -311,6 +313,8 @@ OPENHARMONY_PARTS += "developtools:bytrace_standard"
OPENHARMONY_PARTS += "developtools:hdc_standard" OPENHARMONY_PARTS += "developtools:hdc_standard"
OPENHARMONY_PARTS += "deviceprofile:device_profile_core" OPENHARMONY_PARTS += "deviceprofile:device_profile_core"
OPENHARMONY_PARTS += "distributeddatamgr:distributeddatamgr" OPENHARMONY_PARTS += "distributeddatamgr:distributeddatamgr"
OPENHARMONY_PARTS += "distributeddatamgr:distributedfilejs"
OPENHARMONY_PARTS += "distributeddatamgr:e2fsprogs"
OPENHARMONY_PARTS += "distributeddatamgr:native_appdatamgr" OPENHARMONY_PARTS += "distributeddatamgr:native_appdatamgr"
OPENHARMONY_PARTS += "distributedhardware:device_manager_base" OPENHARMONY_PARTS += "distributedhardware:device_manager_base"
OPENHARMONY_PARTS += "distributedschedule:dmsfwk_standard" OPENHARMONY_PARTS += "distributedschedule:dmsfwk_standard"
...@@ -320,6 +324,8 @@ OPENHARMONY_PARTS += "filemanagement:storage_service" ...@@ -320,6 +324,8 @@ OPENHARMONY_PARTS += "filemanagement:storage_service"
OPENHARMONY_PARTS += "global:i18n_standard" OPENHARMONY_PARTS += "global:i18n_standard"
OPENHARMONY_PARTS += "global:resmgr_standard" OPENHARMONY_PARTS += "global:resmgr_standard"
OPENHARMONY_PARTS += "graphic:graphic_standard" OPENHARMONY_PARTS += "graphic:graphic_standard"
OPENHARMONY_PARTS += "hdf:audio_device_driver"
OPENHARMONY_PARTS += "hdf:battery_device_driver"
OPENHARMONY_PARTS += "hdf:device_driver_framework" OPENHARMONY_PARTS += "hdf:device_driver_framework"
OPENHARMONY_PARTS += "hdf:hdf" OPENHARMONY_PARTS += "hdf:hdf"
OPENHARMONY_PARTS += "hdf:mocks" OPENHARMONY_PARTS += "hdf:mocks"
...@@ -341,6 +347,7 @@ OPENHARMONY_PARTS += "hiviewdfx:hitrace_native" ...@@ -341,6 +347,7 @@ OPENHARMONY_PARTS += "hiviewdfx:hitrace_native"
OPENHARMONY_PARTS += "hiviewdfx:hiviewdfx_hilog_native" OPENHARMONY_PARTS += "hiviewdfx:hiviewdfx_hilog_native"
OPENHARMONY_PARTS += "miscservices:inputmethod_native" OPENHARMONY_PARTS += "miscservices:inputmethod_native"
OPENHARMONY_PARTS += "miscservices:time_native" OPENHARMONY_PARTS += "miscservices:time_native"
OPENHARMONY_PARTS += "msdp:device_status"
OPENHARMONY_PARTS += "multimedia:multimedia_audio_standard" OPENHARMONY_PARTS += "multimedia:multimedia_audio_standard"
OPENHARMONY_PARTS += "multimedia:multimedia_camera_standard" OPENHARMONY_PARTS += "multimedia:multimedia_camera_standard"
OPENHARMONY_PARTS += "multimedia:multimedia_histreamer" OPENHARMONY_PARTS += "multimedia:multimedia_histreamer"
...@@ -361,15 +368,22 @@ OPENHARMONY_PARTS += "security:deviceauth_standard" ...@@ -361,15 +368,22 @@ OPENHARMONY_PARTS += "security:deviceauth_standard"
OPENHARMONY_PARTS += "security:device_security_level" OPENHARMONY_PARTS += "security:device_security_level"
OPENHARMONY_PARTS += "security:huks" OPENHARMONY_PARTS += "security:huks"
OPENHARMONY_PARTS += "security:permission_standard" OPENHARMONY_PARTS += "security:permission_standard"
OPENHARMONY_PARTS += "security:selinux"
OPENHARMONY_PARTS += "sensors:sensor" OPENHARMONY_PARTS += "sensors:sensor"
OPENHARMONY_PARTS += "startup:appspawn" OPENHARMONY_PARTS += "startup:appspawn"
OPENHARMONY_PARTS += "startup:init" OPENHARMONY_PARTS += "startup:init"
OPENHARMONY_PARTS += "startup:startup_l2" OPENHARMONY_PARTS += "startup:startup_l2"
OPENHARMONY_PARTS += "telephony:core_service" OPENHARMONY_PARTS += "telephony:core_service"
OPENHARMONY_PARTS += "telephony:ril_adapter" OPENHARMONY_PARTS += "telephony:ril_adapter"
OPENHARMONY_PARTS += "usb:libusb_shared"
OPENHARMONY_PARTS += "useriam:auth_executor_mgr"
OPENHARMONY_PARTS += "useriam:pin_auth"
OPENHARMONY_PARTS += "useriam:user_auth"
OPENHARMONY_PARTS += "useriam:user_idm" OPENHARMONY_PARTS += "useriam:user_idm"
OPENHARMONY_PARTS += "useriam:useriam_common"
OPENHARMONY_PARTS += "utils:utils_base" OPENHARMONY_PARTS += "utils:utils_base"
OPENHARMONY_PARTS += "window:window_manager" OPENHARMONY_PARTS += "window:window_manager"
OPENHARMONY_PARTS += "wpa_supplicant-2.9:wpa_supplicant-2.9"
python generate_parts_json() { python generate_parts_json() {
# parts.json file is used by the loader.py tool to generate BUILD.gn files # parts.json file is used by the loader.py tool to generate BUILD.gn files
...@@ -816,13 +830,6 @@ do_install_ptest:append() { ...@@ -816,13 +830,6 @@ do_install_ptest:append() {
EXCLUDE_FROM_SHLIBS = "1" EXCLUDE_FROM_SHLIBS = "1"
# FIXME: this is a dirty workaround for a bunch of missing *.z.so files, either
# from parts we need to install, or some problems with "inner kits" not being
# installed to our image. These are most likely real problems that we need to
# fix, as the components needing these will most likely fail in all kinds of
# wonderful ways.
INSANE_SKIP:${PN} = "file-rdeps"
# To avoid excessive diskspace blowup, we are stripping our executables # To avoid excessive diskspace blowup, we are stripping our executables
INSANE_SKIP:${PN} += "already-stripped" INSANE_SKIP:${PN} += "already-stripped"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment