Issue #86: fix vrt vendor_boot issues

- support vendor_boot "board" filed
- fix unpack problem when vrt is enabled
- add test case
- upgrade to kotlin 1.6.21

bbootimg/build.gradle.kts

@@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.6.20"
+    kotlin("jvm") version "1.6.21"
     application
 }
 

bbootimg/src/main/kotlin/bootimg/Common.kt

@@ -122,7 +122,7 @@ class Common {
             parseKernelInfo(s.dumpFile)
         }
 
-        fun dumpRamdisk(s: Helper.Slice, root: String): String {
+        fun dumpRamdisk(s: Helper.Slice, root: String, unpackCpio: Boolean = true): String {
             var ret = "gz"
             Helper.extractFile(s.srcFile, s.dumpFile, s.offset.toLong(), s.length)
             when {
@@ -164,7 +164,9 @@ class Common {
                     throw IllegalArgumentException("ramdisk is in unknown format")
                 }
             }
-            unpackRamdisk(s.dumpFile, root)
+            if (unpackCpio) {
+                unpackRamdisk(s.dumpFile, root)
+            }
             return ret
         }
 

bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt

@@ -346,7 +346,8 @@ data class VendorBoot(
         //ramdisk
         //@formatter:off
         val fmt = C.dumpRamdisk(
-            Helper.Slice(info.output, ramdisk.position.toInt(), ramdisk.size, ramdisk.file), "${workDir}root")
+            Helper.Slice(info.output, ramdisk.position.toInt(), ramdisk.size, ramdisk.file), "${workDir}root",
+            this.ramdisk_table.ramdidks.isEmpty())
         //@formatter:on
         this.ramdisk.file = this.ramdisk.file + ".$fmt"
         //dtb
@@ -458,6 +459,9 @@ data class VendorBoot(
                     }
                 }
             }
+            if (info.product.isNotBlank()) {
+                addArgument("--board").addArgument(info.product)
+            }
             addArgument("--dtb").addArgument(dtb.file)
             addArgument("--vendor_cmdline").addArgument(info.cmdline, false)
             addArgument("--header_version").addArgument(info.headerVersion.toString())

helper/build.gradle.kts

@@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.6.20"
+    id("org.jetbrains.kotlin.jvm") version "1.6.21"
     `java-library`
     application
 }

integrationTest.py

@@ -163,6 +163,8 @@ def main():
         log.info("dtbo not fully supported on MacOS, skip testing")
     # Issue 83: init_boot
     verifySingleDir(resDir2, "issue_83")
+    # Issue 86: vendor_boot with vrt and board name
+    verifySingleDir(resDir2, "issue_86")
 
     log.info(successLogo)
 

src/integrationTest/resources_2

@@ -1 +1 @@
-Subproject commit dc7e1b693d328e2abbe3158ff98f971f3bcae917
+Subproject commit b4c46ec5b4e9da09a1142058d63b054e9fd2cddc