Skip to content

Fix launch with kernel repacking#2531

Merged
Databean merged 1 commit intogoogle:mainfrom
Databean:fix_kernel_mix
May 8, 2026
Merged

Fix launch with kernel repacking#2531
Databean merged 1 commit intogoogle:mainfrom
Databean:fix_kernel_mix

Conversation

@Databean
Copy link
Copy Markdown
Member

@Databean Databean commented May 7, 2026

At some point assemble_cvd expected cpio to return non-zero values on success, which is no longer true. Newer versions of cpio return 0 on success. Ignoring the return value of cpio seems to work, the kernel is replaced successfully.

Tested with:

bazel-bin/cuttlefish/package/cuttlefish-common/bin/cvd fetch --default_build=git_main/aosp_cf_x86_64_only_phone-trunk_staging-userdebug --target_directory=$HOME/dl_kernel --kernel_build=aosp_kernel-common-android-mainline/kernel_virt_x86_64
bazel-bin/cuttlefish/package/cuttlefish-common/bin/cvd create --host_path=$HOME/dl_kernel --product_path=$HOME/dl_kernel

Bug: b/427835411
Bug: b/510369069

@Databean Databean requested review from jemoreira and ser-io May 7, 2026 21:47
At some point assemble_cvd expected `cpio` to return non-zero values on
success, which is no longer true. Newer versions of cpio return 0 on
success. Ignoring the return value of cpio seems to work, the kernel is
replaced successfully.

Tested with:
```
bazel-bin/cuttlefish/package/cuttlefish-common/bin/cvd fetch --default_build=git_main/aosp_cf_x86_64_only_phone-trunk_staging-userdebug --target_directory=$HOME/dl_kernel --kernel_build=aosp_kernel-common-android-mainline/kernel_virt_x86_64
bazel-bin/cuttlefish/package/cuttlefish-common/bin/cvd create --host_path=$HOME/dl_kernel --product_path=$HOME/dl_kernel
```

Bug: b/427835411
Bug: b/510369069
@Databean Databean added this pull request to the merge queue May 8, 2026
@Databean
Copy link
Copy Markdown
Member Author

Databean commented May 8, 2026

Thanks for reviewing!

Merged via the queue into google:main with commit 3257ff8 May 8, 2026
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants