[PATCH olpc-os-builder 01/14] Fixes for relative bios-crypto path

[Sascha Silbe]

From: Bernie Innocenti <bernie at codewiz.org>


Signed-off-by: Sascha Silbe <silbe at activitycentral.com>
---
 modules/signing/finalize.50.makefszip_zsp.sh |    6 +++---
 modules/signing/preimage.40.sign-firmware.sh |    2 +-
 modules/signing/preimage.40.sign-os.sh       |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/signing/finalize.50.makefszip_zsp.sh b/modules/signing/finalize.50.makefszip_zsp.sh
index 2b25a9c..4be4c38 100644
--- a/modules/signing/finalize.50.makefszip_zsp.sh
+++ b/modules/signing/finalize.50.makefszip_zsp.sh
@@ -30,9 +30,9 @@ make_signed_zsp()
 	echo "Generating signed fs.zip for $(basename $1)..."
 	local outfile=$outputdir/$(basename $1).fs.zip
 	pushd $bios_crypto/build
-	rm -rf $bios_crypto/build/fs.zip
-	$bios_crypto/build/sign-zsp.sh $skey $1
-	mv $bios_crypto/build/fs.zip $outfile
+	rm -rf fs.zip
+	./sign-zsp.sh $skey $1
+	mv fs.zip $outfile
 	popd
 }
 
diff --git a/modules/signing/preimage.40.sign-firmware.sh b/modules/signing/preimage.40.sign-firmware.sh
index 15cf90e..1f8093e 100644
--- a/modules/signing/preimage.40.sign-firmware.sh
+++ b/modules/signing/preimage.40.sign-firmware.sh
@@ -20,7 +20,7 @@ mv $fwtmp/data.img $intermediatesdir/fw.rom
 outzip=$intermediatesdir/bootfw.zip
 rm -f $outzip
 pushd $bios_crypto/build
-$bios_crypto/build/sign-fw.sh $wkey $intermediatesdir/fw.rom $outzip
+./sign-fw.sh $wkey $intermediatesdir/fw.rom $outzip
 popd
 mv $outzip $fsmount/boot/
 
diff --git a/modules/signing/preimage.40.sign-os.sh b/modules/signing/preimage.40.sign-os.sh
index 857bdb2..19ddc3b 100644
--- a/modules/signing/preimage.40.sign-os.sh
+++ b/modules/signing/preimage.40.sign-os.sh
@@ -11,7 +11,7 @@ bios_crypto=$(read_config signing bios_crypto_path)
 if [ -e "$fsmount/boot/vmlinuz" ]; then
 	echo "Signing kernel..."
 	pushd $bios_crypto/build
-	$bios_crypto/build/sign-os.sh $okey $fsmount/boot/vmlinuz $fsmount/boot/runos.zip
+	./sign-os.sh $okey $fsmount/boot/vmlinuz $fsmount/boot/runos.zip
 	popd
 	[ -e $fsmount/boot/actos.zip ] || ln -s runos.zip $fsmount/boot/actos.zip
 fi
@@ -19,7 +19,7 @@ fi
 if [ -e "$fsmount/boot/initrd.img" ]; then
 	echo "Signing initramfs..."
 	pushd $bios_crypto/build
-	$bios_crypto/build/sign-os.sh $okey $fsmount/boot/initrd.img $fsmount/boot/runrd.zip
+	./sign-os.sh $okey $fsmount/boot/initrd.img $fsmount/boot/runrd.zip
 	popd
 fi
 
-- 
1.7.4.1