Added xz-utils for x86_64 and updated to 5.0.4 (from scottmc).

This commit is contained in:
Alex Smith
2013-02-21 20:58:50 +00:00
parent 32bd2dedd9
commit 7f562d441c
+13 -6
View File
@@ -2358,12 +2358,17 @@ if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] {
# XZ-Utils # XZ-Utils
if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] { if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ; if $(TARGET_ARCH) = x86_64 {
} else { InstallOptionalHaikuImagePackage
InstallOptionalHaikuImagePackage xz-utils-5.0.4-x86_64-2013-02-16.zip
xz-utils-5.0.1-r1a4-x86-gcc4-2012-09-03.zip : $(baseURL)/xz-utils-5.0.4-x86_64-2013-02-16.zip ;
: $(baseURL)/xz-utils-5.0.1-r1a4-x86-gcc4-2012-09-03.zip ; } else {
InstallOptionalHaikuImagePackage
xz-utils-5.0.4-x86-gcc4-2013-02-16.zip
: $(baseURL)/xz-utils-5.0.4-x86-gcc4-2013-02-16.zip ;
}
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
: "tar -Jtvf \\0045s" : "tar -Jtvf \\0045s"
: "tar -Jxvf \\0045s" : "tar -Jxvf \\0045s"
@@ -2376,6 +2381,8 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
: "echo \\0045s | sed 's/.xz\\\$//g'" : "echo \\0045s | sed 's/.xz\\\$//g'"
: "xz -df \\0045s" : "xz -df \\0045s"
; ;
} else {
Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;
} }
} }