diff options
| author | Daniel Drake <dsd@laptop.org> | 2012-09-13 21:59:01 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2012-09-13 21:59:01 (GMT) |
| commit | c5cb6551027da10d04f39ed1c04e166cc4878652 (patch) | |
| tree | 5996ac9aba99c298451608ccd550d7c6c904b561 /modules/signing/preimage.10.extract.sh | |
| parent | 5c9a93a5730c2c30d61eb8066a9155fb10f94749 (diff) | |
Revert "Always ship kernel/initramfs in zip files"
This reverts commit 41b5c8982e70ea61fde8aac6d2ed4bbe90458dc0.
It breaks boot on XO-1.75; the kernel boots but can't find dtree/atb.
Diffstat (limited to 'modules/signing/preimage.10.extract.sh')
| -rw-r--r-- | modules/signing/preimage.10.extract.sh | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/modules/signing/preimage.10.extract.sh b/modules/signing/preimage.10.extract.sh index 489f8b4..5a7a471 100644 --- a/modules/signing/preimage.10.extract.sh +++ b/modules/signing/preimage.10.extract.sh @@ -14,20 +14,31 @@ mkdir -p $tgt found=0 echo "Extracting content for signing..." +if [ -e "$fsmount/boot/bootfw.zip" ]; then + cp $fsmount/boot/bootfw.zip $tgt + found=1 +fi -copy_out_file() { - local name=$1 - local path="$fsmount"/boot/${1}.zip - [ -f "$path"] || return - cp $path $tgt +if [ -e "$fsmount/boot/vmlinuz" ]; then + cp $fsmount/boot/vmlinuz $tgt/data.img + zip -j -n .img $tgt/runos.zip $tgt/data.img + rm -f $tgt/data.img found=1 -} +fi + +if [ -e "$fsmount/boot/initrd.img" ]; then + cp $fsmount/boot/initrd.img $tgt/data.img + zip -j -n .img $tgt/runrd.zip $tgt/data.img + rm -f $tgt/data.img + found=1 +elif [ -e "$fsmount/boot/olpcrd.img" ]; then + cp $fsmount/boot/olpcrd.img $tgt/data.img + zip -j -n .img $tgt/runrd.zip $tgt/data.img + rm -f $tgt/data.img + found=1 +fi -copy_out bootfw -copy_out runos -copy_out runrd -copy_out actos -copy_out actrd [ "$found" == "1" ] || exit 0 zip -j $outzip $tgt/* + |