From 2821833d2e292ba86d7a4da4a43453f503ff9569 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 09:00:42 +0100 Subject: move more variables into libvasile, refactor md5sum checking using md5sum itself --- build64 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index 9f46ac6..8736c28 100755 --- a/build64 +++ b/build64 @@ -4,7 +4,7 @@ source libvasile envkogaionstart () { # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building - mount -t squashfs "$sqfsroot" "$rodir" + mount -t squashfs "$sqfsrootx64" "$rodir" mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir" # keep built binary packages around, we will convert them to deb packages using vasile while : true ; do @@ -65,13 +65,10 @@ envkogaionsquashfsintegrity () { # our bare metal buildserver is x86_64 but we want to build 32bit packages as well # run this script with linux32 to fool it we run i686 and to build 32bit packages while : true ; do - export local sqfsroot="kogaiondevelx64.squashfs" - export local sqfsrootmd5file=""$sqfsroot".md5" - export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})" - if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then + if [[ -f "$sqfsrootx64" && -f "$sqfsrootx64md5" ]] ; then echo "Good, x86_64 squashed chroot && checksum file FOUND ... verifying integrity" echo "" - if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then + if [[ "$(md5sum -c "$sqfsrootx64md5")" ]] ; then echo "Good, x86_64 squashed chroot checksum PASSED ... starting environment" echo "" sleep 1 -- cgit v1.2.3