Skip to content

Commit b0b1bcc

Browse files
committed
dtb update for abe
1 parent 38dd70a commit b0b1bcc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ data class BootV3(
288288
//ramdisk
289289
if (ramdisk.size > 0) {
290290
val fmt = C.dumpRamdisk(
291-
Helper.Slice(info.role, ramdisk.position, ramdisk.size, ramdisk.file), File(workDir, "root").toString()
291+
Helper.Slice(info.input, ramdisk.position, ramdisk.size, ramdisk.file), File(workDir, "root").toString()
292292
)
293293
this.ramdisk.file = this.ramdisk.file + ".$fmt"
294294
if (fmt == "xz") {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ data class VendorBoot(
246246
//Fixed: remove cpio in C/C++
247247
//C.packRootfs("$workDir/root", this.ramdisk.file, parseOsMajor())
248248
//enable advance JAVA cpio
249-
C.packRootfs("$workDir/root", this.ramdisk.file, this.ramdisk.xzFlags)
249+
C.packRootfs(Helper.joinPath("$workDir", "root"), this.ramdisk.file, this.ramdisk.xzFlags)
250250
}
251251
this.ramdisk.size = File(this.ramdisk.file).length().toInt()
252252
}
253253
else -> {
254254
this.ramdisk_table.ramdidks.forEachIndexed { index, it ->
255255
File(it.file).deleleIfExists()
256-
log.info(Helper.joinPath(workDir!!, "/root.${index + 1}") + " -> " + it.file)
256+
log.info(Helper.joinPath(workDir!!, "root.${index + 1}") + " -> " + it.file)
257257
C.packRootfs(Helper.joinPath(workDir, "root.${index + 1}"), it.file, this.ramdisk.xzFlags)
258258
}
259259
this.ramdisk.size = this.ramdisk_table.ramdidks.sumOf { File(it.file).length() }.toInt()
@@ -416,7 +416,7 @@ data class VendorBoot(
416416
}
417417
val tab = AsciiTable().let {
418418
it.addRule()
419-
val imageInfoJsonFile = Helper.joinPath(workDir!!, info.role.removeSuffix(".img"), ".json")
419+
val imageInfoJsonFile = Helper.joinPath(workDir!!, info.role.removeSuffix(".img") + ".json")
420420
it.addRow("image info", imageInfoJsonFile)
421421
prints.add(Pair("image info", imageInfoJsonFile))
422422
it.addRule()

bbootimg/src/main/kotlin/packable/DeviceTreeParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class DeviceTreeParser : IPackable {
4343
log.info("\n\t\t\tPack Summary of {}\n{}\n", fileName, Common.table2String(prints))
4444
}
4545

46-
override fun pull(fileName: String, deviceName: String) {
46+
fun pull(fileName: String) {
4747
//prepare
4848
super.clear()
4949
File(workDir).mkdir()

0 commit comments

Comments
 (0)