Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b58fa064 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "ueventd: change firmware location in apexes" am: fb2dafa5 am: 25dea8c2 am: 829aec97 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429931

Change-Id: Ifa8d6672d6b87212d8d48373e510b803dee828ea
parents 209bd162 829aec97

init/README.ueventd.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ Ueventd by default serves firmware requests by searching through a list of firmw 
for a file matching the uevent `FIRMWARE`. It then forks a process to serve this firmware to the

for a file matching the uevent `FIRMWARE`. It then forks a process to serve this firmware to the

kernel.

kernel.





`/apex/*/firmware` is also searched after a list of firmware directories.

`/apex/*/etc/firmware` is also searched after a list of firmware directories.





The list of firmware directories is customized by a `firmware_directories` line in a ueventd.rc

The list of firmware directories is customized by a `firmware_directories` line in a ueventd.rc

file. This line takes the format of

file. This line takes the format of

init/firmware_handler.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -256,7 +256,7 @@ bool FirmwareHandler::ForEachFirmwareDirectory( 
    }

    }





    glob_t glob_result;

    glob_t glob_result;

    glob("/apex/*/firmware/", GLOB_MARK, nullptr, &glob_result);

    glob("/apex/*/etc/firmware/", GLOB_MARK, nullptr, &glob_result);

    auto free_glob = android::base::make_scope_guard(std::bind(&globfree, &glob_result));

    auto free_glob = android::base::make_scope_guard(std::bind(&globfree, &glob_result));

    for (size_t i = 0; i < glob_result.gl_pathc; i++) {

    for (size_t i = 0; i < glob_result.gl_pathc; i++) {

        char* apex_firmware_directory = glob_result.gl_pathv[i];

        char* apex_firmware_directory = glob_result.gl_pathv[i];