dtb update for abe

pull/159/head
cfig 1 year ago
parent 38dd70a5fd
commit b0b1bcc968

@ -288,7 +288,7 @@ data class BootV3(
//ramdisk //ramdisk
if (ramdisk.size > 0) { if (ramdisk.size > 0) {
val fmt = C.dumpRamdisk( val fmt = C.dumpRamdisk(
Helper.Slice(info.role, ramdisk.position, ramdisk.size, ramdisk.file), File(workDir, "root").toString() Helper.Slice(info.input, ramdisk.position, ramdisk.size, ramdisk.file), File(workDir, "root").toString()
) )
this.ramdisk.file = this.ramdisk.file + ".$fmt" this.ramdisk.file = this.ramdisk.file + ".$fmt"
if (fmt == "xz") { if (fmt == "xz") {

@ -246,14 +246,14 @@ data class VendorBoot(
//Fixed: remove cpio in C/C++ //Fixed: remove cpio in C/C++
//C.packRootfs("$workDir/root", this.ramdisk.file, parseOsMajor()) //C.packRootfs("$workDir/root", this.ramdisk.file, parseOsMajor())
//enable advance JAVA cpio //enable advance JAVA cpio
C.packRootfs("$workDir/root", this.ramdisk.file, this.ramdisk.xzFlags) C.packRootfs(Helper.joinPath("$workDir", "root"), this.ramdisk.file, this.ramdisk.xzFlags)
} }
this.ramdisk.size = File(this.ramdisk.file).length().toInt() this.ramdisk.size = File(this.ramdisk.file).length().toInt()
} }
else -> { else -> {
this.ramdisk_table.ramdidks.forEachIndexed { index, it -> this.ramdisk_table.ramdidks.forEachIndexed { index, it ->
File(it.file).deleleIfExists() File(it.file).deleleIfExists()
log.info(Helper.joinPath(workDir!!, "/root.${index + 1}") + " -> " + it.file) log.info(Helper.joinPath(workDir!!, "root.${index + 1}") + " -> " + it.file)
C.packRootfs(Helper.joinPath(workDir, "root.${index + 1}"), it.file, this.ramdisk.xzFlags) C.packRootfs(Helper.joinPath(workDir, "root.${index + 1}"), it.file, this.ramdisk.xzFlags)
} }
this.ramdisk.size = this.ramdisk_table.ramdidks.sumOf { File(it.file).length() }.toInt() this.ramdisk.size = this.ramdisk_table.ramdidks.sumOf { File(it.file).length() }.toInt()
@ -416,7 +416,7 @@ data class VendorBoot(
} }
val tab = AsciiTable().let { val tab = AsciiTable().let {
it.addRule() it.addRule()
val imageInfoJsonFile = Helper.joinPath(workDir!!, info.role.removeSuffix(".img"), ".json") val imageInfoJsonFile = Helper.joinPath(workDir!!, info.role.removeSuffix(".img") + ".json")
it.addRow("image info", imageInfoJsonFile) it.addRow("image info", imageInfoJsonFile)
prints.add(Pair("image info", imageInfoJsonFile)) prints.add(Pair("image info", imageInfoJsonFile))
it.addRule() it.addRule()

@ -43,7 +43,7 @@ class DeviceTreeParser : IPackable {
log.info("\n\t\t\tPack Summary of {}\n{}\n", fileName, Common.table2String(prints)) log.info("\n\t\t\tPack Summary of {}\n{}\n", fileName, Common.table2String(prints))
} }
override fun pull(fileName: String, deviceName: String) { fun pull(fileName: String) {
//prepare //prepare
super.clear() super.clear()
File(workDir).mkdir() File(workDir).mkdir()

Loading…
Cancel
Save