try to fix new lzma problem and use lz4 legacy format

Lopicl · Jul 17, 2016 · ebfd6ea · ebfd6ea
1 parent a570a99
commit ebfd6ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/scripts/build_boot_img_lz4 b/scripts/build_boot_img_lz4
@@ -208,7 +208,7 @@ cd BOOT-EXTRACTED
 
 echo 
 echo "Creating ramdisk cpio archive ..."
-./$mkbootfs_file boot.img-ramdisk | lz4 > ramdisk.lz4
+./$mkbootfs_file boot.img-ramdisk | lz4 -l > ramdisk.lz4
 
 
 

diff --git a/scripts/build_boot_img_lzma b/scripts/build_boot_img_lzma
@@ -208,7 +208,7 @@ cd BOOT-EXTRACTED
 
 echo 
 echo "Creating ramdisk cpio archive ..."
-./$mkbootfs_file boot.img-ramdisk | lzma > ramdisk.xz
+./$mkbootfs_file boot.img-ramdisk | lzma --format=lzma > ramdisk.lzma
 
 
 
@@ -292,9 +292,9 @@ fi
 
 if [ "$cmd_line" == "" ]
 then
-  ./$mkbootimg_file --kernel zImage --ramdisk ramdisk.xz -o newBoot.img --base $base $ramdisk_params
+  ./$mkbootimg_file --kernel zImage --ramdisk ramdisk.lzma -o newBoot.img --base $base $ramdisk_params
 else
-  ./$mkbootimg_file --kernel zImage --ramdisk ramdisk.xz --cmdline "$cmd_line" -o newBoot.img --base $base $ramdisk_params
+  ./$mkbootimg_file --kernel zImage --ramdisk ramdisk.lzma --cmdline "$cmd_line" -o newBoot.img --base $base $ramdisk_params
 fi
 
 

diff --git a/tools/extract_boot_files/extract-ramdisk.pl b/tools/extract_boot_files/extract-ramdisk.pl
@@ -52,7 +52,7 @@ sub extract {
 system ("gzip -d -c ../$ARGV[0]-ramdisk.cpio.gz | cpio -i");
 system ("rm ../$ARGV[0]-ramdisk.cpio.gz");
 } 
-elsif ($ram1 =~ /\x5D\x00...\xFF\xFF\xFF\xFF\xFF\xFF/)
+elsif (substr($ram1, 0, 2) eq "\x5D\x00")
 {
 print "lzma\n";
 open (RAM1FILE, ">$ARGV[0]-ramdisk.cpio.lzma");