diff --git a/oriole/patches/build/0001-add-soc_platform.patch b/oriole/patches/build/0001-add-soc_platform.patch index 8189fc2acfde5b033b97d81d88061a1d71993881..5262029a562dd5cddea4450abc504a8ef8f53976 100644 --- a/oriole/patches/build/0001-add-soc_platform.patch +++ b/oriole/patches/build/0001-add-soc_platform.patch @@ -1,39 +1,80 @@ -From 4bbf696ce47252573fc7d7168dcd415f7175c3e1 Mon Sep 17 00:00:00 2001 +From 0967e46ba35a480059f8c33b61412f3f863842ff Mon Sep 17 00:00:00 2001 From: sunchanglong -Date: Mon, 15 Jul 2024 14:06:58 +0800 -Subject: [PATCH] add soc_platform +Date: Wed, 24 Jul 2024 15:29:30 +0800 +Subject: [PATCH] =?UTF-8?q?soc=5Fplatform=E9=80=82=E9=85=8D=20=20Signed-of?= + =?UTF-8?q?f-by:=20sunchanglong=20?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -Change-Id: I5aee1c8511e0386d804090b6e09f681d0c392eed +Change-Id: I25ec4075c56efa9479e9f0c24d8ea076a95331d2 --- - ohos/images/build_image.py | 3 ++- - ohos/images/mkimage/dac.txt | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) + ohos/images/build_image.py | 9 +++++++++ + ohos/images/mkimage/dac.txt | 3 +++ + ohos/images/mkimage/debug/userdata_image_conf.txt | 2 +- + ohos/images/mkimage/userdata_image_conf.txt | 2 +- + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ohos/images/build_image.py b/ohos/images/build_image.py -index 0b0c38fc..3f417f41 100755 +index 0b0c38fc..aac6ca9b 100755 --- a/ohos/images/build_image.py +++ b/ohos/images/build_image.py -@@ -40,7 +40,8 @@ def _prepare_root(system_path: str, target_cpu: str): - os.makedirs(root_dir, exist_ok=True) - _dir_list = [ - 'config', 'dev', 'proc', 'sys', 'updater', 'system', 'vendor', 'data', 'chip_ckm', -- 'storage', 'mnt', 'tmp', 'sys_prod', 'chip_prod', 'module_update', 'eng_system', 'eng_chipset' -+ 'storage', 'mnt', 'tmp', 'sys_prod', 'chip_prod', 'module_update', 'eng_system', 'eng_chipset', -+ 'soc_platform' - ] - for _dir_name in _dir_list: - os.makedirs(os.path.join(root_dir, _dir_name), exist_ok=True) +@@ -80,6 +80,13 @@ def _prepare_ramdisk(ramdisk_path: str): + os.makedirs(_path, exist_ok=True) + os.symlink('bin/init_early', os.path.join(ramdisk_path, 'init')) + ++def _prepare_vendor(vendor_path: str): ++ _dir_list = ['soc_platform'] ++ for _dir_name in _dir_list: ++ _path = os.path.join(vendor_path, _dir_name) ++ if os.path.exists(_path): ++ continue ++ os.makedirs(_path, exist_ok=True) + + def _prepare_eng_ststem(eng_system_path: str, build_variant: str): + if os.path.exists(eng_system_path): +@@ -125,6 +132,8 @@ def _make_image(args): + _prepare_updater(args.input_path, args.target_cpu) + elif args.image_name == 'ramdisk': + _prepare_ramdisk(args.input_path) ++ elif args.image_name == 'vendor': ++ _prepare_vendor(args.input_path) + image_type = "raw" + if args.sparse_image: + image_type = "sparse" diff --git a/ohos/images/mkimage/dac.txt b/ohos/images/mkimage/dac.txt -index bc939aac..888b898b 100644 +index bc939aac..907661b4 100644 --- a/ohos/images/mkimage/dac.txt +++ b/ohos/images/mkimage/dac.txt @@ -59,3 +59,6 @@ system/lib/ld-musl-riscv64.so.1,00755, 0, 2000, 0 updater/lib/ld-musl-riscv64.so.1,00755, 0, 2000, 0 system/lib/ld-musl-riscv64-asan.so.1,00755, 0, 2000, 0 updater/lib/ld-musl-riscv64-asan.so.1,00755, 0, 2000, 0 -+soc_platform, 00755, 0, 2000, 0 -+soc_platform/bin, 00751, 0, 2000, 0 -+soc_platform/bin/*, 00755, 0, 2000, 0 ++vendor/soc_platform, 00755, 0, 2000, 0 ++vendor/soc_platform/bin, 00751, 0, 2000, 0 ++vendor/soc_platform/bin/*, 00755, 0, 2000, 0 +diff --git a/ohos/images/mkimage/debug/userdata_image_conf.txt b/ohos/images/mkimage/debug/userdata_image_conf.txt +index acbb10c6..9b2342e1 100644 +--- a/ohos/images/mkimage/debug/userdata_image_conf.txt ++++ b/ohos/images/mkimage/debug/userdata_image_conf.txt +@@ -1,5 +1,5 @@ + /data +-1468006400 ++67108864 + --fs_type=f2fs + --dac_config ../../build/ohos/images/mkimage/dac.txt + --file_context obj/base/security/selinux_adapter/file_contexts.bin +diff --git a/ohos/images/mkimage/userdata_image_conf.txt b/ohos/images/mkimage/userdata_image_conf.txt +index 273af2e5..7dccf6fb 100644 +--- a/ohos/images/mkimage/userdata_image_conf.txt ++++ b/ohos/images/mkimage/userdata_image_conf.txt +@@ -1,5 +1,5 @@ + /data +-1468006400 ++67108864 + --fs_type=f2fs + --dac_config ../../build/ohos/images/mkimage/dac.txt + --file_context obj/base/security/selinux_adapter/file_contexts.bin -- 2.25.1