From dfd2d49e968c4892b1823b5414700d99d4292acf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Aug 2015 20:24:55 +0100 Subject: masive refactoring of vasile, our supreme tool...first make it modular so we can add more functions to it --- build64 | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100755 build64 (limited to 'build64') diff --git a/build64 b/build64 new file mode 100755 index 0000000..1e6cf23 --- /dev/null +++ b/build64 @@ -0,0 +1,195 @@ +#!/usr/bin/env bash + +# env mount variables +export local rodir="rodir" +export local rwdir="rwdir" +export local overlaydir="overlaydir" + +# env user variable +export local envkogaionuser="root" + +# env target variable (can be a single package, multiple packages, or a target file passed as parameter) +export local envkogaiontarget="$@" +export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget"" + +# env buildsystem variables +export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml" +export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml" +export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git" +export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage" +export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile" + +envkogaionstart () { + # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building + mount -t squashfs "$sqfsroot" "$rodir" + mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir" + # portage buildpkg feature is now enabled by default, so all built packages or targets will also have binary packages created + # each target depends on previous one, building a target will most likely pull packages from previous one + # to avoid useless rebuilds, bind mount portage binary packages folder, and use binaries if needed + # every binary was built in same clean build environment managed by vasile, so they are safe to reuse + # vasile will still clean the build environment, but will leave binaries in place + while : true ; do + if [[ ! -d packages ]] ; then + mkdir packages + mount -o bind packages "$overlaydir"/usr/portage/packages + break + elif [[ -d packages ]] ; then + mount -o bind packages "$overlaydir"/usr/portage/packages + break + fi + done + # keep distfiles around + while : true ; do + if [[ ! -d distfiles ]] ; then + mkdir distfiles + mount -o bind distfiles "$overlaydir"/usr/portage/distfiles + break + elif [[ -d distfiles ]] ; then + mount -o bind distfiles "$overlaydir"/usr/portage/distfiles + break + fi + done + # bind mount targets inside clean build environment managed by vasile, we really need them to be in there + mount -o bind targets "$overlaydir"/mnt + mount -t proc proc "$overlaydir"/proc + mount -t sysfs sysfs "$overlaydir"/sys + mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev + mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts + mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm + mount -t tmpfs -o nosuid,nodev,noexec none "$overlaydir"/tmp +} + +envkogaionstop () { + # umount squashfs + overlayfs chroot + umount -l "$overlaydir"/proc > /dev/null 2>&1 + umount -l "$overlaydir"/sys > /dev/null 2>&1 + umount -l "$overlaydir"/dev/pts > /dev/null 2>&1 + umount -l "$overlaydir"/dev/shm > /dev/null 2>&1 + umount -l "$overlaydir"/dev > /dev/null 2>&1 + umount -l "$overlaydir"/tmp > /dev/null 2>&1 + umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1 + umount -l "$overlaydir"/mnt > /dev/null 2>&1 + umount -l "$overlaydir" > /dev/null 2>&1 + umount -l "$rodir" > /dev/null 2>&1 +} + +envcheckroot () { + if [[ "$(whoami)" != root ]] ; then + echo "" + echo "You're not root?...No cookies for you, go away !!!" + echo "" + exit 1 + fi +} + +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 + echo "Good, x86_64 squashed chroot && checksum file FOUND ... verifying integrity" + echo "" + if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then + echo "Good, x86_64 squashed chroot checksum PASSED ... starting environment" + echo "" + sleep 1 + break + else + echo "Ooops, x86_64 squashed chroot checksum FAILED ... aborting" + exit 1 + fi + else + echo "Ooops, x86_64 squashed chroot or checksum file NOT FOUND ... aborting" + exit 1 + fi + done +} + +envkogaionprepare () { + # check our environment for sanity + # if safe, trigger start && break the loop to build packages + # else trigger stop && cleanup && check again + while : true ; do + if [[ ! -d "$rodir" && ! -d "$rwdir" && ! -d "$overlaydir" ]] ; then + for i in "$rodir" "$rwdir" "$overlaydir" ; do + mkdir "$i" + done + envkogaionstart + break + elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then + envkogaionstop + for i in "$rodir" "$rwdir" "$overlaydir" ; do + rm -rf "$i" + done + continue + fi + done +} + +envkogaionoverlays() { + # inject our overlays into squashfs + overlayfs chroot + echo "Injecting Kogaion Linux Main Overlay into x86_64 environment" + sleep 1 + chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay" + echo "Injecting Kogaion Linux Desktop Overlay into x86_64 environment" + sleep 1 + chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay" +} + +envkogaionbuildsystem() { + # inject our buildsystem into squashfs + overlayfs chroot + export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf" + export local envkogaionprofile="eselect profile set 1" + echo "Injecting Kogaion Linux X86_64 Buildsystem && Setting up Portage && Setting up make.conf" + echo "" + sleep 1 + for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do + chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd" + done +} + +envkogaionbuild () { + # build packages in squashfs + overlayfs chroot + echo "" + echo "x86_46 Environment is UP && RUNNING ... building targets" + sleep 1 + chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget" +} + +envkogaionchroot() { +# enter squashfs + overlayfs chroot to push packages, or debug build errors + echo -e "" + echo -e "#################################################################" + echo -e "# ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES #" + echo -e "# OR TO FIX EVENTUAL BUILD ERRORS #" + echo -e "#################################################################" + echo -e "# !!! WARNING !!! WARNING !!! WARNING !!! #" + echo -e "#################################################################" + echo -e "# NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK #" + echo -e "# DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS #" + echo -e "# OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED #" + echo -e "#################################################################" + echo -e "# !!! WARNING !!! WARNING !!! WARNING !!! #" + echo -e "#################################################################" + echo -e "" + echo -e "" + chroot "$overlaydir" su - "$envkogaionuser" +} + +main () { + if envcheckroot ; then + envkogaionsquashfsintegrity + envkogaionprepare + envkogaionoverlays + envkogaionbuildsystem + envkogaionbuild + envkogaionchroot + envkogaionstop + fi +} + +main +exit 0 -- cgit v1.2.3 From 3a6e918d46840289227e58a5ac1850113fcd2400 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Aug 2015 20:38:24 +0100 Subject: remove previous comments, focus on our next target, transform gentoo packages on deb packages to be used by apt --- build64 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index 1e6cf23..0aca7a4 100755 --- a/build64 +++ b/build64 @@ -23,11 +23,7 @@ envkogaionstart () { # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building mount -t squashfs "$sqfsroot" "$rodir" mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir" - # portage buildpkg feature is now enabled by default, so all built packages or targets will also have binary packages created - # each target depends on previous one, building a target will most likely pull packages from previous one - # to avoid useless rebuilds, bind mount portage binary packages folder, and use binaries if needed - # every binary was built in same clean build environment managed by vasile, so they are safe to reuse - # vasile will still clean the build environment, but will leave binaries in place + # keep built binary packages around, we will convert them to deb packages using vasile while : true ; do if [[ ! -d packages ]] ; then mkdir packages -- cgit v1.2.3 From 3126bda8b8e03c1a9ee32aacf5caf6204d958f3f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 08:34:49 +0100 Subject: move some common variables to libvasile, common functions will follow --- build64 | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index 0aca7a4..9f46ac6 100755 --- a/build64 +++ b/build64 @@ -1,23 +1,6 @@ #!/usr/bin/env bash -# env mount variables -export local rodir="rodir" -export local rwdir="rwdir" -export local overlaydir="overlaydir" - -# env user variable -export local envkogaionuser="root" - -# env target variable (can be a single package, multiple packages, or a target file passed as parameter) -export local envkogaiontarget="$@" -export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget"" - -# env buildsystem variables -export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml" -export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml" -export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git" -export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage" -export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile" +source libvasile envkogaionstart () { # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building -- cgit v1.2.3 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 From 34ba1e37e44f7b7af2f1243dc9dc75a6a9c6ecdb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 09:15:08 +0100 Subject: move last variables into libvasile --- build64 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index 8736c28..fd83ef7 100755 --- a/build64 +++ b/build64 @@ -117,12 +117,10 @@ envkogaionoverlays() { envkogaionbuildsystem() { # inject our buildsystem into squashfs + overlayfs chroot - export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf" - export local envkogaionprofile="eselect profile set 1" echo "Injecting Kogaion Linux X86_64 Buildsystem && Setting up Portage && Setting up make.conf" echo "" sleep 1 - for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do + for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconfx64" "$envkogaionprofile" "$envkogaionenvupdate" ; do chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd" done } -- cgit v1.2.3 From 92b62f115b2634086483b5bbf7ded04615814c2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 09:21:16 +0100 Subject: move common functions into libvasile --- build64 | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index fd83ef7..cbff47d 100755 --- a/build64 +++ b/build64 @@ -38,29 +38,6 @@ envkogaionstart () { mount -t tmpfs -o nosuid,nodev,noexec none "$overlaydir"/tmp } -envkogaionstop () { - # umount squashfs + overlayfs chroot - umount -l "$overlaydir"/proc > /dev/null 2>&1 - umount -l "$overlaydir"/sys > /dev/null 2>&1 - umount -l "$overlaydir"/dev/pts > /dev/null 2>&1 - umount -l "$overlaydir"/dev/shm > /dev/null 2>&1 - umount -l "$overlaydir"/dev > /dev/null 2>&1 - umount -l "$overlaydir"/tmp > /dev/null 2>&1 - umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1 - umount -l "$overlaydir"/mnt > /dev/null 2>&1 - umount -l "$overlaydir" > /dev/null 2>&1 - umount -l "$rodir" > /dev/null 2>&1 -} - -envcheckroot () { - if [[ "$(whoami)" != root ]] ; then - echo "" - echo "You're not root?...No cookies for you, go away !!!" - echo "" - exit 1 - fi -} - 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 -- cgit v1.2.3 From 216fdc3715478ffc5306e136064e82d74617c762 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 09:57:31 +0100 Subject: import libvasile into vasile itself, for slaves to use it...no need to import twice in each slave --- build64 | 2 -- 1 file changed, 2 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index cbff47d..df0b3aa 100755 --- a/build64 +++ b/build64 @@ -1,7 +1,5 @@ #!/usr/bin/env bash -source libvasile - envkogaionstart () { # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building mount -t squashfs "$sqfsrootx64" "$rodir" -- cgit v1.2.3 From ae79222cb89bc8644b64bba498a88499da9812e7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 11:37:50 +0100 Subject: revert previous commit, enable debug mode by default, untill we sort things out --- build64 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build64') diff --git a/build64 b/build64 index df0b3aa..07d1a5a 100755 --- a/build64 +++ b/build64 @@ -1,4 +1,6 @@ -#!/usr/bin/env bash +#!/bin/bash -x + +source libvasile envkogaionstart () { # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building -- cgit v1.2.3 From 39624eac34c86a82bcaa1ae87d923c3613890d23 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 14:29:41 +0100 Subject: solved arguments, so import libvasile into vasile itself, and slaves can use from over there --- build64 | 2 -- 1 file changed, 2 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index 07d1a5a..2c695b9 100755 --- a/build64 +++ b/build64 @@ -1,7 +1,5 @@ #!/bin/bash -x -source libvasile - envkogaionstart () { # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building mount -t squashfs "$sqfsrootx64" "$rodir" -- cgit v1.2.3 From 86a93edf4d06cb4f03582432bd32a821a687e51a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Aug 2015 18:46:54 +0100 Subject: move almost everything into libvasile --- build64 | 129 ++++++---------------------------------------------------------- 1 file changed, 11 insertions(+), 118 deletions(-) (limited to 'build64') diff --git a/build64 b/build64 index 2c695b9..6628014 100755 --- a/build64 +++ b/build64 @@ -1,65 +1,6 @@ #!/bin/bash -x -envkogaionstart () { - # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building - 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 - if [[ ! -d packages ]] ; then - mkdir packages - mount -o bind packages "$overlaydir"/usr/portage/packages - break - elif [[ -d packages ]] ; then - mount -o bind packages "$overlaydir"/usr/portage/packages - break - fi - done - # keep distfiles around - while : true ; do - if [[ ! -d distfiles ]] ; then - mkdir distfiles - mount -o bind distfiles "$overlaydir"/usr/portage/distfiles - break - elif [[ -d distfiles ]] ; then - mount -o bind distfiles "$overlaydir"/usr/portage/distfiles - break - fi - done - # bind mount targets inside clean build environment managed by vasile, we really need them to be in there - mount -o bind targets "$overlaydir"/mnt - mount -t proc proc "$overlaydir"/proc - mount -t sysfs sysfs "$overlaydir"/sys - mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev - mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts - mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm - mount -t tmpfs -o nosuid,nodev,noexec none "$overlaydir"/tmp -} - -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 - if [[ -f "$sqfsrootx64" && -f "$sqfsrootx64md5" ]] ; then - echo "Good, x86_64 squashed chroot && checksum file FOUND ... verifying integrity" - echo "" - if [[ "$(md5sum -c "$sqfsrootx64md5")" ]] ; then - echo "Good, x86_64 squashed chroot checksum PASSED ... starting environment" - echo "" - sleep 1 - break - else - echo "Ooops, x86_64 squashed chroot checksum FAILED ... aborting" - exit 1 - fi - else - echo "Ooops, x86_64 squashed chroot or checksum file NOT FOUND ... aborting" - exit 1 - fi - done -} - -envkogaionprepare () { +chrootpreparex64 () { # check our environment for sanity # if safe, trigger start && break the loop to build packages # else trigger stop && cleanup && check again @@ -68,10 +9,10 @@ envkogaionprepare () { for i in "$rodir" "$rwdir" "$overlaydir" ; do mkdir "$i" done - envkogaionstart + chrootstartx64 break elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then - envkogaionstop + chrootstop for i in "$rodir" "$rwdir" "$overlaydir" ; do rm -rf "$i" done @@ -80,63 +21,15 @@ envkogaionprepare () { done } -envkogaionoverlays() { - # inject our overlays into squashfs + overlayfs chroot - echo "Injecting Kogaion Linux Main Overlay into x86_64 environment" - sleep 1 - chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay" - echo "Injecting Kogaion Linux Desktop Overlay into x86_64 environment" - sleep 1 - chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay" -} - -envkogaionbuildsystem() { - # inject our buildsystem into squashfs + overlayfs chroot - echo "Injecting Kogaion Linux X86_64 Buildsystem && Setting up Portage && Setting up make.conf" - echo "" - sleep 1 - for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconfx64" "$envkogaionprofile" "$envkogaionenvupdate" ; do - chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd" - done -} - -envkogaionbuild () { - # build packages in squashfs + overlayfs chroot - echo "" - echo "x86_46 Environment is UP && RUNNING ... building targets" - sleep 1 - chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget" -} - -envkogaionchroot() { -# enter squashfs + overlayfs chroot to push packages, or debug build errors - echo -e "" - echo -e "#################################################################" - echo -e "# ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES #" - echo -e "# OR TO FIX EVENTUAL BUILD ERRORS #" - echo -e "#################################################################" - echo -e "# !!! WARNING !!! WARNING !!! WARNING !!! #" - echo -e "#################################################################" - echo -e "# NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK #" - echo -e "# DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS #" - echo -e "# OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED #" - echo -e "#################################################################" - echo -e "# !!! WARNING !!! WARNING !!! WARNING !!! #" - echo -e "#################################################################" - echo -e "" - echo -e "" - chroot "$overlaydir" su - "$envkogaionuser" -} - main () { - if envcheckroot ; then - envkogaionsquashfsintegrity - envkogaionprepare - envkogaionoverlays - envkogaionbuildsystem - envkogaionbuild - envkogaionchroot - envkogaionstop + if checkroot ; then + chrootchecksumx64 + chrootpreparex64 + chrootoverlaysx64 + chrootbuildsystemx64 + chrootbuildx64 + chrootx64 + chrootstop fi } -- cgit v1.2.3