openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 02863b95: add /vendor support 

Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp

* commit '02863b957cfbfc302d3136ed78c0cba86accacd8':
  add /vendor support
This commit is contained in:
Brian Swetland 2010-09-19 03:49:43 -07:00 committed by Android Git Automerger
parent 06b21887e8 02863b957c
commit 3b5214a67f
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/private/android_filesystem_config.h
View File

@ -142,6 +142,7 @@ static struct fs_path_config android_dirs[] = {
{ 00771, AID_SYSTEM, AID_SYSTEM, "data" },
{ 00750, AID_ROOT, AID_SHELL, "sbin" },
{ 00755, AID_ROOT, AID_SHELL, "system/bin" },
{ 00755, AID_ROOT, AID_SHELL, "system/vendor" },
{ 00755, AID_ROOT, AID_SHELL, "system/xbin" },
{ 00755, AID_ROOT, AID_ROOT, "system/etc/ppp" },
{ 00777, AID_ROOT, AID_ROOT, "sdcard" },
@ -190,6 +191,7 @@ static struct fs_path_config android_files[] = {
{ 06750, AID_ROOT, AID_SHELL, "system/bin/run-as" },
{ 00755, AID_ROOT, AID_SHELL, "system/bin/*" },
{ 00755, AID_ROOT, AID_SHELL, "system/xbin/*" },
{ 00755, AID_ROOT, AID_SHELL, "system/vendor/bin/*" },
{ 00750, AID_ROOT, AID_SHELL, "sbin/*" },
{ 00755, AID_ROOT, AID_ROOT, "bin/*" },
{ 00750, AID_ROOT, AID_SHELL, "init*" },

27
init/devices.c
View File

@ -39,7 +39,8 @@
#include "list.h"
#define SYSFS_PREFIX "/sys"
#define FIRMWARE_DIR "/etc/firmware"
#define FIRMWARE_DIR1 "/etc/firmware"
#define FIRMWARE_DIR2 "/vendor/firmware"
static int device_fd = -1;
@ -480,7 +481,7 @@ out:
static void process_firmware_event(struct uevent *uevent)
{
char *root, *loading, *data, *file;
char *root, *loading, *data, *file1 = NULL, *file2 = NULL;
int l, loading_fd, data_fd, fw_fd;
log_event_print("firmware event { '%s', '%s' }\n",
@ -498,7 +499,11 @@ static void process_firmware_event(struct uevent *uevent)
if (l == -1)
goto loading_free_out;
l = asprintf(&file, FIRMWARE_DIR"/%s", uevent->firmware);
l = asprintf(&file1, FIRMWARE_DIR1"/%s", uevent->firmware);
if (l == -1)
goto data_free_out;
l = asprintf(&file2, FIRMWARE_DIR2"/%s", uevent->firmware);
if (l == -1)
goto data_free_out;
@ -510,14 +515,17 @@ static void process_firmware_event(struct uevent *uevent)
if(data_fd < 0)
goto loading_close_out;
fw_fd = open(file, O_RDONLY);
if(fw_fd < 0)
goto data_close_out;
fw_fd = open(file1, O_RDONLY);
if(fw_fd < 0) {
fw_fd = open(file2, O_RDONLY);
if(fw_fd < 0)
goto data_close_out;
}
if(!load_firmware(fw_fd, loading_fd, data_fd))
log_event_print("firmware copy success { '%s', '%s' }\n", root, file);
log_event_print("firmware copy success { '%s', '%s' }\n", root, uevent->firmware);
else
log_event_print("firmware copy failure { '%s', '%s' }\n", root, file);
log_event_print("firmware copy failure { '%s', '%s' }\n", root, uevent->firmware);
close(fw_fd);
data_close_out:
@ -525,7 +533,8 @@ data_close_out:
loading_close_out:
close(loading_fd);
file_free_out:
free(file);
free(file1);
free(file2);
data_free_out:
free(data);
loading_free_out:

8
rootdir/init.rc
View File

@ -8,8 +8,8 @@ sysclktz 0
loglevel 3
# setup the global environment
export PATH /sbin:/system/sbin:/system/bin:/system/xbin
export LD_LIBRARY_PATH /system/lib
export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
export LD_LIBRARY_PATH /vendor/lib:/system/lib
export ANDROID_BOOTLOGO 1
export ANDROID_ROOT /system
export ANDROID_ASSETS /system/app
@ -23,6 +23,10 @@ loglevel 3
symlink /system/etc /etc
symlink /sys/kernel/debug /d
# Right now vendor lives on the same filesystem as system,
# but someday that may change.
symlink /system/vendor /vendor
# create mountpoints
mkdir /mnt 0775 root system
mkdir /mnt/sdcard 0000 system system