diff options
-rwxr-xr-x | build32 | 127 | ||||
-rwxr-xr-x | build64 | 129 | ||||
-rwxr-xr-x | libvasile | 248 |
3 files changed, 238 insertions, 266 deletions
@@ -1,64 +1,6 @@ #!/bin/bash -x -envkogaionstart () { - # mount ro squashfs chroot + add rw overlayfs layer to enable clean package building - 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 - 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 "$sqfsrootx86" && -f "$sqfsrootx86md5" ]] ; then - echo "Good, i686 squashed chroot && checksum file FOUND ... verifying integrity" - echo "" - if [[ "$(md5sum -c "$sqfsrootx86md5")" ]] ; then - echo "Good, i686 squashed chroot checksum PASSED ... starting environment" - echo "" - sleep 1 - break - else - echo "Ooops, i686 squashed chroot checksum FAILED ... aborting" - fi - else - echo "Ooops, i686 squashed chroot of checksum file NOT FOUND ... aborting" - exit 1 - fi - done -} - -envkogaionprepare () { +chrootpreparex86 () { # check our environment for sanity # if safe, trigger start && break the loop to build packages # else trigger stop && cleanup && check again @@ -67,10 +9,10 @@ envkogaionprepare () { for i in "$rodir" "$rwdir" "$overlaydir" ; do mkdir "$i" done - envkogaionstart + chrootstartx86 break elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then - envkogaionstop + chrootstop for i in "$rodir" "$rwdir" "$overlaydir" ; do rm -rf "$i" done @@ -79,62 +21,15 @@ envkogaionprepare () { done } -envkogaionoverlays() { - # inject our overlays into squashfs + overlayfs chroot - echo "Injecting Kogaion Linux Main Overlay into i686 environment" - sleep 1 - linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay" - echo "Injecting Kogaion Linux Desktop Overlay into i686 environment" - linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay" -} - -envkogaionbuildsystem() { - # inject our buildsystem into squashfs + overlayfs chroot - echo "Injecting Kogaion Linux i686 Buildsystem && Setting up Portage && Setting up make.conf" - echo "" - sleep 1 - for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconfx86" "$envkogaionprofile" "$envkogaionenvupdate" ; do - linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd" - done -} - -envkogaionbuild () { - # build packages in squashfs + overlayfs chroot - echo "" - echo "i686 Environment is UP && RUNNING ... building targets" - sleep 1 - linux32 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 "" - linux32 chroot "$overlaydir" su - "$envkogaionuser" -} - main () { - if envcheckroot ; then - envkogaionsquashfsintegrity - envkogaionprepare - envkogaionoverlays - envkogaionbuildsystem - envkogaionbuild - envkogaionchroot - envkogaionstop + if checkroot ; then + chrootchecksumx86 + chrootpreparex86 + chrootoverlaysx86 + chrootbuildsystemx86 + chrootbuildx86 + chrootx86 + chrootstop fi } @@ -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 } @@ -1,37 +1,18 @@ -# env mount variables +# arch agnostic code export local rodir="rodir" export local rwdir="rwdir" export local overlaydir="overlaydir" +export local chrootuser="root" +export local chroottarget="${@:2}" +export local chrootbuildtarget="emerge -kav "$chroottarget"" +export local chrootoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml" +export local chrootdesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml" +export local chrootbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git" +export local chrootportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage" +export local chrootenvupdate="/usr/sbin/env-update && . /etc/profile" +export local chrootprofile="eselect profile set 1" -# env user variable -export local envkogaionuser="root" - -# env target variable (can be a single package, multiple packages, or a target file passed as parameter) -# vasile is now splitted, so calling it with one of its build arguments (--build32 or --build64) -# would import that argument into envkogaiontarget variable and building most likely would fail -# so change envkogaiontarget variable for vasile to skip build arguments and focus and next ones (target files, or packages) -export local envkogaiontarget="${@:2}" -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" -export local envkogaionprofile="eselect profile set 1" - -# env squashfs chroot variables -export local sqfsrootx86="kogaiondevelx86.squashfs" -export local sqfsrootx86md5=""$sqfsrootx86".md5" -export local sqfsrootx64="kogaiondevelx64.squashfs" -export local sqfsrootx64md5=""$sqfsrootx64".md5" - -# env make.conf variables -export local envkogaionmakeconfx86="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf" -export local envkogaionmakeconfx64="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf" - -envcheckroot () { +checkroot () { if [[ "$(whoami)" != root ]] ; then echo "" echo "You're not root?...No cookies for you, go away !!!" @@ -40,8 +21,7 @@ envcheckroot () { fi } -envkogaionstop () { - # umount squashfs + overlayfs chroot +chrootstop () { 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 @@ -53,3 +33,207 @@ envkogaionstop () { umount -l "$overlaydir" > /dev/null 2>&1 umount -l "$rodir" > /dev/null 2>&1 } + +# x64 specific code +export local chrootx64="kogaiondevelx64.squashfs" +export local chrootx64md5=""$chrootx64".md5" +export local chrootmakeconfx64="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf" + +chrootchecksumx64 () { + while : true ; do + if [[ -f "$chrootx64" && -f "$chrootx64md5" ]] ; then + echo "Good, x64 squashed chroot && checksum file FOUND ... verifying integrity" + echo "" + if [[ "$(md5sum -c "$chrootx64md5")" ]] ; then + echo "Good, x64 squashed chroot checksum PASSED ... starting environment" + echo "" + sleep 1 + break + else + echo "Ooops, x64 squashed chroot checksum FAILED ... aborting" + exit 1 + fi + else + echo "Ooops, x64 squashed chroot or checksum file NOT FOUND ... aborting" + exit 1 + fi + done +} + +chrootstartx64 () { + mount -t squashfs "$chrootx64" "$rodir" + mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir" + 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 + 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 + 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 +} + +chrootoverlaysx64() { + echo "Injecting Kogaion Linux Main Overlay into x64 environment" + sleep 1 + chroot "$overlaydir" su - "$chrootuser" -c "$chrootoverlay" + echo "Injecting Kogaion Linux Desktop Overlay into x64 environment" + sleep 1 + chroot "$overlaydir" su - "$chrootuser" -c "$chrootdesktopoverlay" +} + +chrootbuildsystemx64() { + echo "Injecting Kogaion Linux x64 Buildsystem && Setting up Portage && Setting up make.conf" + echo "" + sleep 1 + for cmd in "$chrootbuildgit" "$chrootportageconfig" "$chrootmakeconfx64" "$chrootprofile" "$chrootenvupdate" ; do + chroot "$overlaydir" su - "$chrootuser" -c "$cmd" + done +} + +chrootbuildx64 () { + echo "" + echo "x64 Environment is UP && RUNNING ... building targets" + sleep 1 + chroot "$overlaydir" su - "$chrootuser" -c "$chrootbuildtarget" +} + +chrootx64() { + 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 - "$chrootuser" +} + +# x86 specific code +export local chrootx86="kogaiondevelx86.squashfs" +export local chrootx86md5=""$chrootx86".md5" +export local chrootmakeconfx86="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf" + +chrootchecksumx86 () { + while : true ; do + if [[ -f "$chrootx86" && -f "$chrootx86md5" ]] ; then + echo "Good, x86 squashed chroot && checksum file FOUND ... verifying integrity" + echo "" + if [[ "$(md5sum -c "$chrootx86md5")" ]] ; then + echo "Good, x86 squashed chroot checksum PASSED ... starting environment" + echo "" + sleep 1 + break + else + echo "Ooops, x86 squashed chroot checksum FAILED ... aborting" + exit 1 + fi + else + echo "Ooops, x86 squashed chroot or checksum file NOT FOUND ... aborting" + exit 1 + fi + done +} + +chrootstartx86 () { + mount -t squashfs "$chrootx86" "$rodir" + mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir" + 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 + 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 + 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 +} + +chrootoverlaysx86() { + echo "Injecting Kogaion Linux Main Overlay into x86 environment" + sleep 1 + linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootoverlay" + echo "Injecting Kogaion Linux Desktop Overlay into x86 environment" + sleep 1 + linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootdesktopoverlay" +} + +chrootbuildsystemx86() { + echo "Injecting Kogaion Linux x86 Buildsystem && Setting up Portage && Setting up make.conf" + echo "" + sleep 1 + for cmd in "$chrootbuildgit" "$chrootportageconfig" "$chrootmakeconfx86" "$chrootprofile" "$chrootenvupdate" ; do + linux32 chroot "$overlaydir" su - "$chrootuser" -c "$cmd" + done +} + +chrootbuildx86 () { + echo "" + echo "x64 Environment is UP && RUNNING ... building targets" + sleep 1 + chroot "$overlaydir" su - "$chrootuser" -c "$chrootbuildtarget" +} + +chrootx86() { + 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 "" + linux32 chroot "$overlaydir" su - "$chrootuser" +} |