android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ANDROID: build: Merge multiple vm images into one"

Browse Source
This commit is contained in:
qctecmdr 2023-02-27 21:39:23 -08:00 committed by Gerrit - the friendly Code Review server
commit 3eb23712fb
3 changed files with 115 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
msm_kernel_vm.bzl
View File

@ -25,6 +25,22 @@ load(":image_opts.bzl", "vm_image_opts")
load(":uapi_library.bzl", "define_uapi_library")
load(":target_variants.bzl", "vm_variants")
def define_make_vm_dtb_img(target, dtb_list, page_size):
compiled_dtbs = ["//msm-kernel:{}/{}".format(target, t) for t in dtb_list]
dtb_cmd="compiled_dtb_list=\"{}\"\n".format(" ".join(["$(location {})".format(d) for d in compiled_dtbs]))
dtb_cmd += """
$(location //prebuilts/kernel-build-tools:linux-x86/bin/mkdtboimg) \\
create "$@" --page_size={page_size} $${{compiled_dtb_list}}
""".format(page_size=page_size)
native.genrule(
name = "{}_vm_dtb_img".format(target),
srcs = compiled_dtbs,
outs = ["{}-dtb.img".format(target)],
tools = ["//prebuilts/kernel-build-tools:linux-x86/bin/mkdtboimg"],
cmd_bash = dtb_cmd,
)
def _define_build_config(
msm_target,
variant,
@ -163,8 +179,8 @@ def _define_kernel_build(
kernel_images(
name = "{}_images".format(target),
kernel_build = ":{}".format(target),
boot_image_outs = ["dtb.img"],
build_boot = True,
boot_image_outs = [],
build_boot = False,
kernel_modules_install = None,
)
@ -198,6 +214,7 @@ def _define_kernel_dist(target, msm_target, variant):
":{}_images".format(target),
":{}_merged_kernel_uapi_headers".format(target),
":{}_build_config".format(target),
":{}_vm_dtb_img".format(target),
":signing_key",
":verity_key",
]
@ -281,4 +298,6 @@ def define_msm_vm(
define_uapi_library(target)
define_make_vm_dtb_img(target, dtb_list, vm_image_opts.dummy_img_size)
define_extras(target, flavor = "vm")

2
msm_platforms.bzl
View File

@ -4,6 +4,7 @@ load(":kalama_oemvm.bzl", "define_kalama_oemvm")
load(":pineapple.bzl", "define_pineapple")
load(":pineapple_tuivm.bzl", "define_pineapple_tuivm")
load(":pineapple_oemvm.bzl", "define_pineapple_oemvm")
load(":pineapple_vms.bzl", "define_pineapple_vms")
load(":pineapple_allyes.bzl", "define_pineapple_allyes")
load(":msm_common.bzl", "define_signing_keys")
load("//build:msm_kernel_extensions.bzl", "define_top_level_rules")
@ -18,3 +19,4 @@ def define_msm_platforms():
define_pineapple_tuivm()
define_pineapple_oemvm()
define_pineapple_allyes()
define_pineapple_vms()

92
pineapple_vms.bzl Normal file
View File

@ -0,0 +1,92 @@
load(":target_variants.bzl", "vm_types", "vm_variants")
load("//msm-kernel:msm_common.bzl", "get_out_dir")
load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
load(":image_opts.bzl", "vm_image_opts")
target_name = "pineapple-vms"
def create_combined_vm_image(image_list, variant, vm_size_ext4):
out_files = [
"{}_{}/vm-bootsys.img".format(target_name, variant),
"{}_{}/vm-bootsys_unsparsed.img".format(target_name, variant),
"{}_{}/vm-images".format(target_name, variant),
]
merge_images = "\nimage_dist=\"{}\"\n".format(" ".join(["$(location {})".format(l) for l in image_list]))
merge_images += "vm_image_out_path=\"$(location {})\"\n".format(out_files[0])
merge_images += "vm_image_unsparsed_out_path=\"$(location {})\"\n".format(out_files[1])
merge_images += "vm_images_out_path=\"$(location {})\"\n".format(out_files[2])
merge_images += """
mkdir -p scratch
for dist in $$image_dist; do
# Unpack everything from tuivm
if echo $$dist | grep -q "tuivm"; then
tar -C scratch/ -xf "$$dist"
# Only unpack boot for all other VMs
else
tar -C scratch/ --wildcards -xf "$$dist" "./vm-images/*/boot"
fi
done
# Remove existing vm-bootsys images
rm -f scratch/*.img
# Create non-sparse vm-bootsys.img
$(location //prebuilts/kernel-build-tools:linux-x86/bin/mkuserimg_mke2fs) \
"scratch/vm-images" "$$vm_image_unsparsed_out_path" ext4 / {vm_size_ext4}
# Create sparse vm-bootsys.img
$(location //prebuilts/kernel-build-tools:linux-x86/bin/img2simg) \
"$$vm_image_unsparsed_out_path" "$$vm_image_out_path"
cp -r "scratch/vm-images" "$$vm_images_out_path"
""".format(vm_size_ext4=vm_size_ext4)
native.genrule(
name = "{}_{}_combo".format(target_name, variant),
srcs = image_list,
outs = out_files,
tools = [
"//prebuilts/kernel-build-tools:linux-x86/bin/mkuserimg_mke2fs",
"//prebuilts/kernel-build-tools:linux-x86/bin/img2simg",
],
cmd_bash = merge_images,
)
def define_pineapple_vms(vm_image_opts = vm_image_opts()):
base_target = "pineapple-tuivm"
for variant in vm_variants:
base_tv = "{}_{}".format(base_target, variant)
image_list = [":pineapple-{}_{}_vm_images".format(vt, variant) for vt in vm_types]
create_combined_vm_image(image_list, variant, vm_image_opts.vm_size_ext4)
out_dtb_list = [":pineapple-{}_{}_vm_dtb_img".format(vt, variant) for vt in vm_types]
dist_targets = [
# do not sort
":{}".format(base_tv),
":{}_images".format(base_tv),
":{}_merged_kernel_uapi_headers".format(base_tv),
":{}_build_config".format(base_tv),
":signing_key",
":verity_key",
"{}_{}_combo".format(target_name, variant),
] + out_dtb_list
copy_to_dist_dir(
name = "{}_{}_dist".format(target_name, variant),
data = dist_targets,
dist_dir = "{}/dist".format(get_out_dir(target_name, variant)),
flat = True,
wipe_dist_dir = True,
allow_duplicate_filenames = True,
mode_overrides = {
# do not sort
"**/vmlinux": "755",
"**/Image": "755",
"**/*.dtb*": "755",
"**/gen_init_cpio": "755",
"**/sign-file": "755",
"**/*": "644",
},
)