• 高通平台Android11 添加新分区的方法

    SW：Android11

    HW：QCS6125

    需求来源：

        线上的设备进入recovery模式，正常缓存在data分区的日志无法获取：

    1、此种情境下只能选择恢复出厂设置，但在恢复之后，data目录下的logcat日志也会被清理；2、recovery模式下无法屏蔽分区加密，处于用户数据安全考虑，无法在该模式挂载userdataimage；

        鉴于此，决定重新创建一个分区，将logcat后台记录的日志文件全部移到此分区，由于此分区不参与recovery的双清操作，因此可保证系统再次启动后，该分区依然有recovery模式之前的日志文件，用来排查导致进入recovery模式的原因。我们这个分区的size定义为100M大小，这个可根据自己需要做调整。

    具体操作流程如下：

    1、修改common目录下的分区表文件，命名分区为jingang：

    1. diff --git a/config/ufs/partition.xml b/config/ufs/partition.xml
    2. index fafa0b5..f821818 100755
    3. --- a/config/ufs/partition.xml
    4. +++ b/config/ufs/partition.xml
    5. @@ -19,6 +19,7 @@
    6.          <partition label="misc" size_in_kb="1024" type="82ACC91F-357C-4A68-9C8F-689E1B1A23A1" bootable="false" readonly="false" filename="" />
    7.          <partition label="keystore" size_in_kb="512" type="DE7D4029-0F5B-41C8-AE7E-F6C023A02B33" bootable="false" readonly="false" filename="" />
    8.          <partition label="frp" size_in_kb="512" type="91B72D4D-71E0-4CBF-9B8E-236381CFF17A" bootable="false" readonly="false" filename=""/>
    9. +        <partition label="jingang" size_in_kb="102400" type="66b9d1c5-7881-4a82-8f79-22a768a52db2" bootable="false" readonly="false" filename="jingang.img" sparse="true"/>
    10.          <partition label="super" size_in_kb="6291456" type="89A12DE1-5E41-4CB3-8B4C-B1441EB5DA38" bootable="false" readonly="false" filename="super.img" sparse="true"/>
    11.          <partition label="recovery_a" size_in_kb="98304" type="D504D6DB-FA92-4853-B59E-C7F292E2EA19" bootable="false" readonly="true" filename="recovery.img" sparse="true"/>
    12.                 <partition label="recovery_b" size_in_kb="98304" type="352B8083-9C0C-4BED-9917-CB5EABD64D41" bootable="false" readonly="true" filename="recovery.img" sparse="true"/>
    13. diff --git a/config/ufs/partition_factory.xml b/config/ufs/partition_factory.xml
    14. index 043c6a1..e16842c 100755
    15. --- a/config/ufs/partition_factory.xml
    16. +++ b/config/ufs/partition_factory.xml
    17. @@ -19,6 +19,7 @@
    18.          <partition label="misc" size_in_kb="1024" type="82ACC91F-357C-4A68-9C8F-689E1B1A23A1" bootable="false" readonly="false" filename="misc.img" />
    19.          <partition label="keystore" size_in_kb="512" type="DE7D4029-0F5B-41C8-AE7E-F6C023A02B33" bootable="false" readonly="false" filename="" />
    20.          <partition label="frp" size_in_kb="512" type="91B72D4D-71E0-4CBF-9B8E-236381CFF17A" bootable="false" readonly="false" filename=""/>
    21. +        <partition label="jingang" size_in_kb="102400" type="66b9d1c5-7881-4a82-8f79-22a768a52db2" bootable="false" readonly="false" filename="jingang.img" sparse="true"/>
    22.          <partition label="super" size_in_kb="6291456" type="89A12DE1-5E41-4CB3-8B4C-B1441EB5DA38" bootable="false" readonly="false" filename="super.img" sparse="true"/>
    23.          <partition label="recovery_a" size_in_kb="98304" type="D504D6DB-FA92-4853-B59E-C7F292E2EA19" bootable="false" readonly="true" filename="recovery.img" sparse="true"/>
    24.                 <partition label="recovery_b" size_in_kb="98304" type="352B8083-9C0C-4BED-9917-CB5EABD64D41" bootable="false" readonly="true" filename="recovery.img" sparse="true"/>

    2、相应的缩减data分区100M大小device/qcom/trinket：

    1. diff --git a/BoardConfig.mk b/BoardConfig.mk
    2. index 7ebc32a..965a83e 100755
    3. --- a/BoardConfig.mk
    4. +++ b/BoardConfig.mk
    5. @@ -153,7 +153,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
    6.  # 64G userdata
    7.  # BOARD_USERDATAIMAGE_PARTITION_SIZE := 52676079616
    8.  # 128G userdata sumsung
    9. -BOARD_USERDATAIMAGE_PARTITION_SIZE := 116391936000
    10. +BOARD_USERDATAIMAGE_PARTITION_SIZE := 116255621120
    11.  BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
    12.  BOARD_DTBOIMG_PARTITION_SIZE := 0x0800000
    13.  BOARD_METADATAIMAGE_PARTITION_SIZE := 16777216

    这个size的单位应该是byte。上边分区表是kb，因此就是第一步的大小*1024就是这个值。

    3、该分区无需在AB升级中去升级，添加如下改动device/qcom/vendor-common/ota_merge_configs/dynamic_partition/non_ab：

    1. diff --git a/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list b/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list
    2. index d67f070..ec78e5d 100644
    3. --- a/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list
    4. +++ b/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list
    5. @@ -1,5 +1,6 @@
    6.  IMAGES/cache.img
    7.  IMAGES/vendor.img
    8. +IMAGES/jingang.img
    9.  IMAGES/vendor.map
    10.  IMAGES/odm.img
    11.  IMAGES/odm.map

    4、创建该分区的挂载目录system/core/rootdir：

    1. diff --git a/rootdir/Android.mk b/rootdir/Android.mk
    2. index a9d0ed08a..c6443fed0 100644
    3. --- a/rootdir/Android.mk
    4. +++ b/rootdir/Android.mk
    5. @@ -103,6 +103,9 @@ ifdef BOARD_USES_METADATA_PARTITION
    6.    LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/metadata
    7.  endif
    8.  
    9. +# unrecovery dir
    10. +LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/jingang
    11. +
    12.  # For /odm partition.

    5、system/sepolicy添加上一步创建挂载目录的selinux相关定义：

    1. diff --git a/vendor/file.te b/vendor/file.te
    2. index 0b1fd7480..77e2ae8b2 100644
    3. --- a/vendor/file.te
    4. +++ b/vendor/file.te
    5. @@ -1,2 +1,3 @@
    6.  type hostapd_data_file, file_type, data_file_type;
    7.  type wpa_data_file, file_type, data_file_type;
    8. +type jingang_data_file, file_type;
    9. diff --git a/vendor/file_contexts b/vendor/file_contexts
    10. index 1b2bc2357..0d2ef214c 100644
    11. --- a/vendor/file_contexts
    12. +++ b/vendor/file_contexts
    13. @@ -94,6 +94,10 @@
    14.  /(vendor|system/vendor)/lib(64)?/libhidltransport.so u:object_r:same_process_hal_file:s0
    15.  
    16.  #############################
    17. +
    18. +# for unrecovery partition
    19. +/jingang(/.*)? u:object_r:jingang_data_file:s0
    20. +
    21.  # Data files
    22.  #

    不添加这一步会导致编译时报system大小不够的错误，这个是这里导致的，不用调整System分区大小。

    6、android/device/qcom/trinket 添加fstab自动挂载的指令并修改文件系统节点权限：

    1. diff --git a/default/fstab_AB_dynamic_partition.qti b/default/fstab_AB_dynamic_partition.qti
    2. index 2557d59..a1733fe 100644
    3. --- a/default/fstab_AB_dynamic_partition.qti
    4. +++ b/default/fstab_AB_dynamic_partition.qti
    5. @@ -52,3 +52,4 @@ vendor                                                  /vendor
    6.  # and fails if it does not find it.
    7.  /dev/block/bootdevice/by-name/misc                      /misc              emmc    defaults                                             defaults
    8.  /dev/block/zram0                                        none               swap    defaults                                             zramsize=1073741824
    9. +/dev/block/bootdevice/by-name/jingang                   /jingang           ext4    defaults                                             defaults
    10. diff --git a/emmc/fstab_AB_dynamic_partition.qti b/emmc/fstab_AB_dynamic_partition.qti
    11. index 84dd179..f1211c8 100644
    12. --- a/emmc/fstab_AB_dynamic_partition.qti
    13. +++ b/emmc/fstab_AB_dynamic_partition.qti
    14. @@ -52,3 +52,4 @@ vendor                                                  /vendor
    15.  # and fails if it does not find it.
    16.  /dev/block/bootdevice/by-name/misc                      /misc              emmc    defaults                                             defaults
    17.  /dev/block/zram0                                        none               swap    defaults                                             zramsize=1073741824
    18. +/dev/block/bootdevice/by-name/jingang                   /jingang           ext4    defaults                                             defaults
    19. diff --git a/init.target.rc b/init.target.rc
    20. index 89d0fa2..ca7573b 100755
    21. --- a/init.target.rc
    22. +++ b/init.target.rc
    23. @@ -53,6 +53,10 @@ on fs
    24.      restorecon_recursive /mnt/vendor/persist
    25.      mkdir /mnt/vendor/persist/data 0700 system system
    26.  
    27. +    chown root root /jingang
    28. +    chmod 0777 /jingang
    29. +    restorecon_recursive /jingang
    30. +
    31.  on post-fs

    7、此分区涉及需要刷机的时候把image刷进去，我用的是一个空的ext4

    格式的100M的image文件，也可以添加到build规则里去编译创建，我用的是命令手动创建然后cp到out目录，用来刷机。

    制作命令如下：

    make_ext4fs -s -l 100M test.ext4

    需要注意的是，这个test.ext4文件此时为sparse ext4 image，它是将raw ext4进行稀疏描述，因此尺寸比较小（制作目录有多少文件就计算多少，没有全零填充）。不能直接挂载。

    要再执行如下指令simg2img test.ext4 jingang.img

    然后重命名为.img结尾的文件即可。

    1. diff --git a/trinket.mk b/trinket.mk
    2. index 9c59483..7fa8559 100644
    3. --- a/trinket.mk
    4. +++ b/trinket.mk
    5. @@ -340,6 +340,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
    6.  PRODUCT_PROPERTY_OVERRIDES += \
    7.      ro.boot.wificountrycode=CN
    8.  
    9. +PRODUCT_COPY_FILES += device/qcom/trinket/res/jingang.img:$(PRODUCT_OUT)/jingang.img
    10.

    8、添加物理分区节点的权限device/qcom/common：

    1. diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
    2. index b2813214..5d543e2e 100755
    3. --- a/rootdir/etc/init.qcom.rc
    4. +++ b/rootdir/etc/init.qcom.rc
    5. @@ -202,6 +202,10 @@ on boot
    6.      # bond0 used by FST Manager
    7.      chown wifi wifi /sys/class/net/bond0/bonding/queue_id
    8.  
    9. +    # unrecoverable sysfs node
    10. +    chown root system /dev/block/bootdevice/by-name/jingang
    11. +    chmod 0777 /dev/block/bootdevice/by-name/jingang
    12. +
    13.      # Allow access to emmc rawdump block partition and dload sysfs node
    14.      chown root system /dev/block/bootdevice/by-name/rawdump
    15.      chmod 0660 /dev/block/bootdevice/by-name/rawdump

    9、修改刷机的内容xml，将该分区及image索引对应上：

    1. diff --git a/contents.xml b/contents.xml
    2. index f8ca08f..1b22391 100755
    3. --- a/contents.xml
    4. +++ b/contents.xml
    5. @@ -49,6 +49,10 @@
    6.          abl.elf
    7.          LINUX/android/out/target/product/trinket/
    8.        
    9. +      "true" minimized="true" fastboot="true">
    10. +        jingang.img
    11. +        LINUX/android/out/target/product/trinket/
    12. +      
    13.        "true" minimized="true" fastboot="true">
    14.          super.img
    15.          LINUX/android/out/target/product/trinket/

    后边就是一系列各种selinux规则添加：

    10、这是在device目录下的sepolicy改动：

    1. diff --git a/generic/vendor/common/device.te b/generic/vendor/common/device.te
    2. index e80846f9..6e2fa80e 100644
    3. --- a/generic/vendor/common/device.te
    4. +++ b/generic/vendor/common/device.te
    5. @@ -67,3 +67,5 @@ type vendor_uefi_block_device, dev_type;
    6.  type vendor_qce_device, dev_type;
    7.  type vendor_npu_device, dev_type;
    8.  type vendor_qmcs_block_device, dev_type;
    9. +
    10. +type jingang_block_device,dev_type;
    11. diff --git a/generic/vendor/common/file_contexts b/generic/vendor/common/file_contexts
    12. index a901d15d..db0062c3 100755
    13. --- a/generic/vendor/common/file_contexts
    14. +++ b/generic/vendor/common/file_contexts
    15. @@ -113,6 +113,8 @@
    16.  # Block device for ZRAM
    17.  /dev/block/zram0                                u:object_r:swap_block_device:s0
    18.  
    19. +/dev/block/bootdevice/by-name/jingang u:object_r:jingang_block_device:s0
    20. +
    21.  # files in /vendor
    22.  /vendor/firmware(/.*)?          u:object_r:vendor_firmware_file:s0
    23.  /vendor/bt_firmware(/.*)?       u:object_r:vendor_firmware_file:s0
    24. diff --git a/generic/vendor/common/fsck.te b/generic/vendor/common/fsck.te
    25. index 488eff25..150d5be3 100644
    26. --- a/generic/vendor/common/fsck.te
    27. +++ b/generic/vendor/common/fsck.te
    28. @@ -29,3 +29,4 @@
    29.  allow fsck vendor_persist_block_device:blk_file rw_file_perms;
    30.  allow fsck vendor_qmcs_block_device:blk_file rw_file_perms;
    31.  allowxperm fsck vendor_qmcs_block_device:blk_file ioctl { BLKGETSIZE };
    32. +allow fsck jingang_block_device:blk_file rw_file_perms;
    33. diff --git a/generic/vendor/common/init.te b/generic/vendor/common/init.te
    34. index 21268e50..b38c74ad 100644
    35. --- a/generic/vendor/common/init.te
    36. +++ b/generic/vendor/common/init.te
    37. @@ -52,6 +52,10 @@ allow init vendor_qmcs_file:filesystem { relabelfrom mount unmount relabelto };
    38.  
    39.  dontaudit init kernel:system module_request;
    40.  
    41. +allow init jingang_block_device:blk_file rw_file_perms;
    42. +allow init jingang_block_device:blk_file relabelto;
    43. +allow init jingang_data_file:dir { mounton };
    44. +
    45.  allow init sysfs_leds:lnk_file r_file_perms;
    46.  
    47.  allow init socket_device:sock_file create_file_perms;
    48. diff --git a/generic/vendor/common/shell.te b/generic/vendor/common/shell.te
    49. index 3c0918a8..597739ac 100644
    50. --- a/generic/vendor/common/shell.te
    51. +++ b/generic/vendor/common/shell.te
    52. @@ -28,4 +28,8 @@
    53.  # allow any 3rd party shell app to be a client of DSP HAL
    54.  hal_client_domain(shell, vendor_hal_dspmanager)
    55.  
    56. -get_prop(shell, vendor_opengles_prop)
    57. \ No newline at end of file
    58. +get_prop(shell, vendor_opengles_prop)
    59. +
    60. +r_dir_file(shell, jingang_data_file)
    61. +allow shell jingang_data_file:dir { search open read write add_name create getattr setattr };
    62. +allow shell jingang_data_file:file { open read create write getattr setattr};
    63. diff --git a/generic/vendor/common/vold.te b/generic/vendor/common/vold.te
    64. index bd86659e..d8cd738c 100644
    65. --- a/generic/vendor/common/vold.te
    66. +++ b/generic/vendor/common/vold.te
    67. @@ -29,3 +29,6 @@ get_prop(vold, vendor_tee_listener_prop)
    68.  # Based on the comment from b/111409607 FITRIM might
    69.  # be needed
    70.  allow vold mnt_vendor_file:dir { open read ioctl };
    71. +allow vold jingang_data_file:dir r_dir_perms;
    72. +allow vold jingang_block_device:blk_file { create setattr unlink rw_file_perms };
    73. +allow vold jingang_data_file:dir { read getattr open ioctl };

    依次添加的为：生命device节点类型、添加到file上下文、添加开机阶段fsck的操作权限（否则挂载不上）、添加init进程访问节点权限、添加shell访问挂载目录的权限、添加vold挂载节点的权限。

    12、整编源码，编译完成确认在out下是否有手动制作的image，然后用QF刷机工具先指定contents.xml打包刷机包，再用QF刷机验证。

    13、系统启动后，shell进入，执行df -h可以看到分区是否挂载了；然后cd /jingang目录创建一些文件和目录，然后执行恢复出厂设置。

    14、待恢复完成启动后，cd /jingang目录确认所创建的文件和目录是否还存在，若存在，则需求已实现。

    15、具体的可能还需要添加systemapp或者platformapp的目录读写权限，在此不再赘述，可根据报错自行添加规则验证。

    Mark 一下···

  • 相关阅读:
    MAUI Android 关联文件类型
    Redis实战精讲(1)
    期权交易保证金比例一般是多少？
    Link with Bracket Sequence I（状态基多维dp）
    记一次失败的pip使用经历
    什么是运放的虚短和虚断
    (PC+WAP)织梦模板娱乐新闻资讯类网站
    内存管理(三)——内存分页
    Linux C 进程间通信
    Gitlab在线安装、离线安装、搭建、使用等详细介绍，不能再详细了……
  • 原文地址：https://blog.csdn.net/DKBDKBDKB/article/details/138082728