Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

narcissus: switch to tar.gz to lessen CPU load on server

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information...
commit 10bd73d5ff5c5c74b4b27e151d366bd1465f56c2 1 parent 372f961
@koenkooi koenkooi authored
View
10 backend.php
@@ -42,8 +42,8 @@
if (isset($_POST["imagetype"]) && $_POST["imagetype"] != "") {
$imagetype = $_POST["imagetype"];
} else {
- $imagetype = "tbz2";
- $imagesuffix = "tar.bz2";
+ $imagetype = "tgz";
+ $imagesuffix = "tar.gz";
}
if (isset($_POST["manifest"]) && $_POST["manifest"] != "") {
@@ -65,8 +65,8 @@
}
switch($imagetype) {
- case "tbz2":
- $imagesuffix = "tar.bz2";
+ case "tgz":
+ $imagesuffix = "tar.gz";
break;
case "ubifs":
$imagesuffix = "ubi";
@@ -142,7 +142,7 @@ function show_image_link($machine, $name, $imagesuffix, $manifest, $sdk, $sdkarc
}
$foundimage = 1;
}
- //Angstrom-2010.05-narcissus-hawkboard-i686-random-d4ddcec6-image-toolchain.tar.bz2
+ //Angstrom-2010.05-narcissus-hawkboard-i686-random-d4ddcec6-image-toolchain.tar.gz
if(strpos($value, "narcissus-$machine-$sdkarchname-$name-image-$sdk") !== false) {
rename($location, "$deploydir/$value");
$sdksize = round(filesize("$deploydir/$value") / (1024 * 1024),2);
View
4 index.html
@@ -69,8 +69,8 @@
</div>
<div id='imagetypebox' class="nblock">
- Select the type of image you want.<br/><font size="-2">The 'tar.bz2' option is the most versatile choice since it can be easily converted to other formats later on. The practicality of the other formats depends too much on the device in question to give meaningfull advice here, so we leave that up to you :)</font><br/><br/>
- <input name="imagetype" type="radio" checked="checked" value="tbz2">tar.bz2
+ Select the type of image you want.<br/><font size="-2">The 'tar.gz' option is the most versatile choice since it can be easily converted to other formats later on. The practicality of the other formats depends too much on the device in question to give meaningfull advice here, so we leave that up to you :)</font><br/><br/>
+ <input name="imagetype" type="radio" checked="checked" value="tgz">tar.gz
<input name="imagetype" type="radio" value="ext2">ext2
<input name="imagetype" type="radio" value="ubifs">ubifs
<input name="imagetype" type="radio" value="jffs2">jffs2
View
4 scripts/assemble-image.sh
@@ -102,7 +102,7 @@ function do_tar()
{
echo "tarring up filesystem"
( cd ${TARGET_DIR}
- tar cjf ../${IMAGENAME}-${MACHINE}.tar.bz2 .
+ tar cfz ../${IMAGENAME}-${MACHINE}.tar.gz .
RETVAL=$?
make_sdimg )
}
@@ -339,7 +339,7 @@ case ${IMAGETYPE} in
do_jffs2;;
ubifs)
do_ubifs;;
- tbz2)
+ tgz)
do_tar;;
ext2)
do_ext2;;
View
6 scripts/assemble-sdk.sh
@@ -41,11 +41,11 @@ fi
function do_tar()
{
- ( # tar cfj ${TARGET_DIR}/../${TOOLCHAIN_OUTPUTNAME}-extras.tar.bz2 .
+ ( # tar cfz ${TARGET_DIR}/../${TOOLCHAIN_OUTPUTNAME}-extras.tar.gz .
cd ${SDK_OUTPUT}
- tar cfj ${TARGET_DIR}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
+ tar cfz ${TARGET_DIR}/${TOOLCHAIN_OUTPUTNAME}.tar.gz .
RETVAL=$? )
- mv ${TARGET_DIR}/${TOOLCHAIN_OUTPUTNAME}-extras.tar.bz2 ${TARGET_DIR}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 ${TARGET_DIR}/../
+ mv ${TARGET_DIR}/${TOOLCHAIN_OUTPUTNAME}-extras.tar.gz ${TARGET_DIR}/${TOOLCHAIN_OUTPUTNAME}.tar.gz ${TARGET_DIR}/../
}
modify_opkg_conf () {
Please sign in to comment.
Something went wrong with that request. Please try again.