modules: use zoslight as module base

Author: maxux

packages/modules.sh

@@ -1,22 +1,26 @@
-# MODULES_VERSION="0.4.3"
-# MODULES_CHECKSUM="99fd8573891897543db73673b6f2016d"
-# MODULES_LINK="https://github.com/threefoldtech/zos/archive/v${MODULES_VERSION}.tar.gz"
-MODULES_REPOSITORY="https://github.com/threefoldtech/zos"
-MODULES_VERSION="main"
+MODULES_BASE_REPOSITORY="https://github.com/threefoldtech/zoslight"
+MODULES_BASE_VERSION="main"
+
+MODULES_BOOTSTRAP_REPOSITORY="https://github.com/threefoldtech/zos"
+MODULES_BOOTSTRAP_VERSION="main"
 
 download_modules() {
-    # download_file $MODULES_LINK $MODULES_CHECKSUM zos-${MODULES_VERSION}.tar.gz
-    download_git ${MODULES_REPOSITORY} ${MODULES_VERSION}
+    download_git ${MODULES_BASE_REPOSITORY} ${MODULES_BASE_VERSION}
+    download_git ${MODULES_BOOTSTRAP_REPOSITORY} ${MODULES_BOOTSTRAP_VERSION}
 }
 
 extract_modules() {
-    # if [ ! -d "zos-${MODULES_VERSION}" ]; then
-    #     echo "[+] extracting: zos-${MODULES_VERSION}"
-    #     tar -xf ${DISTFILES}/zos-${MODULES_VERSION}.tar.gz -C .
-    # fi
-    event "refreshing" "zos-${MODULES_VERSION}"
-    rm -rf ./zos-${MODULES_VERSION}
-    cp -a ${DISTFILES}/zos ./zos-${MODULES_VERSION}
+    event "refreshing" "zos-${MODULES_BASE_VERSION}"
+    rm -rf ./zos-${MODULES_BASE_VERSION}
+    cp -a ${DISTFILES}/zoslight ./zos-base-${MODULES_BASE_VERSION}
+
+    event "refreshing" "zos-bootstrap-${MODULES_BOOTSTRAP_VERSION}"
+    rm -rf ./zos-bootstrap-${MODULES_BOOTSTRAP_VERSION}
+    cp -a ${DISTFILES}/zos ./zos-bootstrap-${MODULES_BOOTSTRAP_VERSION}
+
+    event "merging" "zos-bootstrap-${MODULES_BOOTSTRAP_VERSION} > zos-base-${MODULES_BASE_VERSION}"
+    rm -rf ./zos-base-${MODULES_BASE_VERSION}/boostrap
+    cp -a ./zos-bootstrap-${MODULES_BOOTSTRAP_VERSION}/bootstrap ./zos-base-${MODULES_BASE_VERSION}/
 }
 
 prepare_modules() {
@@ -31,7 +35,7 @@ install_modules() {
 }
 
 build_modules() {
-    pushd ${WORKDIR}/zos-${MODULES_VERSION}
+    pushd ${WORKDIR}/zos-base-${MODULES_BASE_VERSION}
 
     prepare_modules
     install_modules