Skip to content

Commit 7a53901

Browse files
committed
Freeze zos modules to v0.4.3
1 parent 12ed50d commit 7a53901

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

initramfs.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,6 @@ main() {
728728
if [[ $DO_ALL == 1 ]] || [[ $DO_CORES == 1 ]]; then
729729
build_zinit
730730
build_zfs
731-
732-
# force re-download if we specify --cores
733-
if [[ $DO_CORES == 1 ]]; then
734-
download_modules
735-
prepare_modules
736-
fi
737-
738731
build_modules
739732
fi
740733

packages/modules.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1-
MODULES_REPOSITORY="https://github.com/threefoldtech/zos"
2-
MODULES_BRANCH="master"
3-
MODULES_TAG=""
4-
5-
TFT_SRC=$GOPATH/src/github.com/threefoldtech
1+
MODULES_VERSION="0.4.3"
2+
MODULES_CHECKSUM="99fd8573891897543db73673b6f2016d"
3+
MODULES_LINK="https://github.com/threefoldtech/zos/archive/v${MODULES_VERSION}.tar.gz"
64

75
download_modules() {
8-
mkdir -p $TFT_SRC
9-
pushd $TFT_SRC
10-
download_git $MODULES_REPOSITORY $MODULES_BRANCH $MODULES_TAG
11-
popd
6+
download_file $MODULES_LINK $MODULES_CHECKSUM zos-${MODULES_VERSION}.tar.gz
7+
}
8+
9+
extract_modules() {
10+
if [ ! -d "zos-${MODULES_VERSION}" ]; then
11+
echo "[+] extracting: zos-${MODULES_VERSION}"
12+
tar -xf ${DISTFILES}/zos-${MODULES_VERSION}.tar.gz -C .
13+
fi
1214
}
1315

1416
prepare_modules() {
1517
echo "[+] prepare modules"
1618
}
1719

1820
install_modules() {
19-
echo "[+] copying binaries"
21+
echo "[+] building zos bootstrap"
2022
pushd bootstrap
2123
make install GO111MODULE=on ROOT=${ROOTDIR}
2224
popd
2325
}
2426

2527
build_modules() {
26-
pushd $TFT_SRC/zos
28+
pushd ${WORKDIR}/zos-${MODULES_VERSION}
2729

2830
prepare_modules
2931
install_modules
@@ -33,6 +35,7 @@ build_modules() {
3335

3436
registrar_modules() {
3537
DOWNLOADERS+=(download_modules)
38+
EXTRACTORS+=(extract_modules)
3639
}
3740

3841
registrar_modules

0 commit comments

Comments
 (0)