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 --- build32 | 19 +------------------ build64 | 19 +------------------ libvasile | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 36 deletions(-) create mode 100755 libvasile diff --git a/build32 b/build32 index e80b736..5ee8e5b 100755 --- a/build32 +++ b/build32 @@ -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 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 diff --git a/libvasile b/libvasile new file mode 100755 index 0000000..0f294a5 --- /dev/null +++ b/libvasile @@ -0,0 +1,18 @@ +# 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" -- cgit v1.2.3