build/debian: Clean up
In this CL we remove some leftover unused code,
and merge the vm_config.json files for ARM and x86.
Bug: 365955006
Bug: 358426674
Test: ./build_in_container.sh
Test: then deploy and test on Cuttlefish x86_64
Change-Id: Iaedada9876975d53ede2aed4f8694b3bd508021c
diff --git a/build/debian/build.sh b/build/debian/build.sh
index 5aa3f28..9c4d4b1 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -318,9 +318,8 @@
generate_output_package() {
fdisk -l "${raw_disk_image}"
- local vm_config="$SCRIPT_DIR/vm_config.json.${arch}"
+ local vm_config="$SCRIPT_DIR/vm_config.json"
local root_partition_num=1
- local bios_partition_num=14
local efi_partition_num=15
pushd ${workdir} > /dev/null
@@ -329,9 +328,6 @@
loop=$(losetup -f --show --partscan $raw_disk_image)
dd if="${loop}p$root_partition_num" of=root_part
- if [[ "$arch" == "x86_64" ]]; then
- dd if="${loop}p$bios_partition_num" of=bios_part
- fi
dd if="${loop}p$efi_partition_num" of=efi_part
losetup -d "${loop}"
@@ -342,9 +338,6 @@
fi
sed -i "s/{root_part_guid}/$(sfdisk --part-uuid $raw_disk_image $root_partition_num)/g" vm_config.json
- if [[ "$arch" == "x86_64" ]]; then
- sed -i "s/{bios_part_guid}/$(sfdisk --part-uuid $raw_disk_image $bios_partition_num)/g" vm_config.json
- fi
sed -i "s/{efi_part_guid}/$(sfdisk --part-uuid $raw_disk_image $efi_partition_num)/g" vm_config.json
popd > /dev/null
diff --git a/build/debian/vm_config.json.aarch64 b/build/debian/vm_config.json
similarity index 100%
rename from build/debian/vm_config.json.aarch64
rename to build/debian/vm_config.json
diff --git a/build/debian/vm_config.json.x86_64 b/build/debian/vm_config.json.x86_64
deleted file mode 100644
index 463583f..0000000
--- a/build/debian/vm_config.json.x86_64
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "name": "debian",
- "disks": [
- {
- "partitions": [
- {
- "label": "ROOT",
- "path": "$PAYLOAD_DIR/root_part",
- "writable": true,
- "guid": "{root_part_guid}"
- },
- {
- "label": "EFI",
- "path": "$PAYLOAD_DIR/efi_part",
- "writable": false,
- "guid": "{efi_part_guid}"
- }
- ],
- "writable": true
- }
- ],
- "sharedPath": [
- {
- "sharedPath": "/storage/emulated"
- },
- {
- "sharedPath": "$APP_DATA_DIR/files"
- }
- ],
- "protected": false,
- "cpu_topology": "match_host",
- "platform_version": "~1.0",
- "memory_mib": 4096,
- "debuggable": true,
- "console_out": true,
- "console_input_device": "ttyS0",
- "network": true,
- "auto_memory_balloon": true,
- "gpu": {
- "backend": "2d"
- }
-}