Skip to content

Commit ebfd6ea

Browse files
committed
try to fix new lzma problem and use lz4 legacy format
1 parent a570a99 commit ebfd6ea

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

scripts/build_boot_img_lz4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ cd BOOT-EXTRACTED
208208

209209
echo
210210
echo "Creating ramdisk cpio archive ..."
211-
./$mkbootfs_file boot.img-ramdisk | lz4 > ramdisk.lz4
211+
./$mkbootfs_file boot.img-ramdisk | lz4 -l > ramdisk.lz4
212212

213213

214214

scripts/build_boot_img_lzma

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ cd BOOT-EXTRACTED
208208

209209
echo
210210
echo "Creating ramdisk cpio archive ..."
211-
./$mkbootfs_file boot.img-ramdisk | lzma > ramdisk.xz
211+
./$mkbootfs_file boot.img-ramdisk | lzma --format=lzma > ramdisk.lzma
212212

213213

214214

@@ -292,9 +292,9 @@ fi
292292

293293
if [ "$cmd_line" == "" ]
294294
then
295-
./$mkbootimg_file --kernel zImage --ramdisk ramdisk.xz -o newBoot.img --base $base $ramdisk_params
295+
./$mkbootimg_file --kernel zImage --ramdisk ramdisk.lzma -o newBoot.img --base $base $ramdisk_params
296296
else
297-
./$mkbootimg_file --kernel zImage --ramdisk ramdisk.xz --cmdline "$cmd_line" -o newBoot.img --base $base $ramdisk_params
297+
./$mkbootimg_file --kernel zImage --ramdisk ramdisk.lzma --cmdline "$cmd_line" -o newBoot.img --base $base $ramdisk_params
298298
fi
299299

300300

tools/extract_boot_files/extract-ramdisk.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ sub extract {
5252
system ("gzip -d -c ../$ARGV[0]-ramdisk.cpio.gz | cpio -i");
5353
system ("rm ../$ARGV[0]-ramdisk.cpio.gz");
5454
}
55-
elsif ($ram1 =~ /\x5D\x00...\xFF\xFF\xFF\xFF\xFF\xFF/)
55+
elsif (substr($ram1, 0, 2) eq "\x5D\x00")
5656
{
5757
print "lzma\n";
5858
open (RAM1FILE, ">$ARGV[0]-ramdisk.cpio.lzma");

0 commit comments

Comments
 (0)