Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2010-07-20 16:12:37 (GMT)
committer Daniel Drake <dsd@laptop.org>2010-07-20 16:12:37 (GMT)
commitc26c7cb53e1a24b3596eff321287ec892e777940 (patch)
treeb61e350597bfb61ebf1db3a83f7d6580c50d3c80 /modules
parentc1ea6f07977deced9768172d74967a629275a7a6 (diff)
don't expose full path in .md5 output files (#10238)
Diffstat (limited to 'modules')
-rw-r--r--modules/jffs2_image/image.50.makeimg.sh8
-rw-r--r--modules/sd_card_image/postimage.50.makezd.sh6
2 files changed, 10 insertions, 4 deletions
diff --git a/modules/jffs2_image/image.50.makeimg.sh b/modules/jffs2_image/image.50.makeimg.sh
index 9746e0d..3d20246 100644
--- a/modules/jffs2_image/image.50.makeimg.sh
+++ b/modules/jffs2_image/image.50.makeimg.sh
@@ -8,7 +8,8 @@ versioned_fs=$(read_config base versioned_fs)
tmpdir=$intermediatesdir/jffs2-fs
tmpimg=$intermediatesdir/jffs2tmp.img
-img=$outputdir/os$buildnr.img
+outfile=os$buildnr.img
+img=$outputdir/$outfile
echo "Copying image contents..."
@@ -30,4 +31,7 @@ mkfs.jffs2 -x rtime -n -e128KiB -r $tmpdir -o $tmpimg
echo "Creating checksums..."
sumtool -n -p -e 128KiB -i $tmpimg -o $img
$bindir/crcimg $img
-md5sum $img > $img.md5
+
+pushd $outputdir >/dev/null
+md5sum $outfile > $outfile.md5
+popd >/dev/null
diff --git a/modules/sd_card_image/postimage.50.makezd.sh b/modules/sd_card_image/postimage.50.makezd.sh
index 07e6a5c..de25339 100644
--- a/modules/sd_card_image/postimage.50.makezd.sh
+++ b/modules/sd_card_image/postimage.50.makezd.sh
@@ -22,8 +22,10 @@ for line in $(env); do
echo "Making ZD image for $osname..."
$bindir/zhashfs 0x20000 sha256 $pfx.disk.img $pfx.zsp $pfx.zd
- echo "Creating MD5sum of $pfx.zd..."
- md5sum $pfx.zd > $pfx.zd.md5
+ echo "Creating MD5sum of $osname.zd..."
+ pushd $outputdir >/dev/null
+ md5sum $osname.zd > $osname.zd.md5
+ popd >/dev/null
if [[ "$compress" == "1" ]]; then
echo "Compressing disk image..."