From 38b5a3c69eb169da3f243daba3d82bafd7162f07 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt <stefan.schmidt@huawei.com> Date: Thu, 23 Mar 2023 15:33:48 +0100 Subject: [PATCH] openharmony-standard: add systemd units for wifi_standard and wifi_hal service Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> --- .../openharmony/files/wifi_hal.service | 9 +++++++++ .../openharmony/files/wifi_hal.service.license | 3 +++ .../openharmony/files/wifi_standard.service | 12 ++++++++++++ .../files/wifi_standard.service.license | 3 +++ .../openharmony/openharmony-standard_3.0.bb | 18 ++++++++++-------- 5 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 recipes-openharmony/openharmony/files/wifi_hal.service create mode 100644 recipes-openharmony/openharmony/files/wifi_hal.service.license create mode 100644 recipes-openharmony/openharmony/files/wifi_standard.service create mode 100644 recipes-openharmony/openharmony/files/wifi_standard.service.license diff --git a/recipes-openharmony/openharmony/files/wifi_hal.service b/recipes-openharmony/openharmony/files/wifi_hal.service new file mode 100644 index 00000000..27f718df --- /dev/null +++ b/recipes-openharmony/openharmony/files/wifi_hal.service @@ -0,0 +1,9 @@ +[Unit] +Description=OpenHarmony Wi-Fi HAL service + +[Service] +Type=exec +ExecStart=/system/bin/wifi_hal_service + +[Install] +WantedBy=multi-user.target diff --git a/recipes-openharmony/openharmony/files/wifi_hal.service.license b/recipes-openharmony/openharmony/files/wifi_hal.service.license new file mode 100644 index 00000000..98a0b3f4 --- /dev/null +++ b/recipes-openharmony/openharmony/files/wifi_hal.service.license @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 diff --git a/recipes-openharmony/openharmony/files/wifi_standard.service b/recipes-openharmony/openharmony/files/wifi_standard.service new file mode 100644 index 00000000..cf6e4790 --- /dev/null +++ b/recipes-openharmony/openharmony/files/wifi_standard.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenHarmony Wi-Fi manager service (SA: 1125 1126 1127 1128) +Requires=samgr.service +After=samgr.service + +[Service] +Type=exec +ExecStartPre=install -m 755 -d /data/dhcp +ExecStart=/system/bin/sa_main /system/profile/wifi_manager_service.xml + +[Install] +WantedBy=multi-user.target diff --git a/recipes-openharmony/openharmony/files/wifi_standard.service.license b/recipes-openharmony/openharmony/files/wifi_standard.service.license new file mode 100644 index 00000000..98a0b3f4 --- /dev/null +++ b/recipes-openharmony/openharmony/files/wifi_standard.service.license @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb index 0ee73885..b83f3b32 100644 --- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb +++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb @@ -819,14 +819,16 @@ RDEPENDS:${PN}-ptest += "${PN}-dsoftbus-ptest" # //foundation/communication/wifi PACKAGES =+ "${PN}-wifi" -#SYSTEMD_PACKAGES += "${PN}-wifi" -#SYSTEMD_SERVICE:${PN}-wifi = "wifi.service" -#SRC_URI += "file://wifi.service" -#do_install:append() { -# install -d ${D}/${systemd_unitdir}/system -# install -m 644 ${WORKDIR}/wifi.service ${D}${systemd_unitdir}/system/ -# rm -f ${D}${sysconfdir}/openharmony/init/wifi_server.cfg -#} +SYSTEMD_PACKAGES += "${PN}-wifi" +SYSTEMD_SERVICE:${PN}-wifi = "wifi_standard.service wifi_hal.service" +SRC_URI += "file://wifi_standard.service file://wifi_hal.service" +do_install:append() { + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/wifi_standard.service ${D}${systemd_unitdir}/system/ + install -m 644 ${WORKDIR}/wifi_hal.service ${D}${systemd_unitdir}/system/ + rm -f ${D}${sysconfdir}/openharmony/init/wifi_standard.cfg + rm -f ${D}${sysconfdir}/openharmony/init/wifi_hal_service.cfg +} FILES:${PN}-wifi = " \ ${libdir}/libwifi_device_ability*${SOLIBS} \ ${libdir}/libwifi_ap_service*${SOLIBS} \ -- GitLab