summaryrefslogtreecommitdiff
path: root/build32
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2015-08-30 09:00:42 +0100
committerV3n3RiX <venerix@rogentos.ro>2015-08-30 09:00:42 +0100
commit2821833d2e292ba86d7a4da4a43453f503ff9569 (patch)
treee12f05ef71eb7f0297c3089869b6f20e4a038b76 /build32
parent3126bda8b8e03c1a9ee32aacf5caf6204d958f3f (diff)
move more variables into libvasile, refactor md5sum checking using md5sum itself
Diffstat (limited to 'build32')
-rwxr-xr-xbuild329
1 files changed, 3 insertions, 6 deletions
diff --git a/build32 b/build32
index 5ee8e5b..4cb7d9f 100755
--- a/build32
+++ b/build32
@@ -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 "$sqfsrootx86" "$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="kogaiondevelx86.squashfs"
- export local sqfsrootmd5file=""$sqfsroot".md5"
- export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})"
- if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then
+ if [[ -f "$sqfsrootx86" && -f "$sqfsrootx86md5" ]] ; then
echo "Good, i686 squashed chroot && checksum file FOUND ... verifying integrity"
echo ""
- if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then
+ if [[ "$(md5sum -c "$sqfsrootx86md5")" ]] ; then
echo "Good, i686 squashed chroot checksum PASSED ... starting environment"
echo ""
sleep 1