From fc66a492be75e4f4c05d08ffe877737b09a182b5 Mon Sep 17 00:00:00 2001 From: Gorka Lerchundi Osa Date: Fri, 13 Mar 2015 23:19:41 +0100 Subject: [PATCH] bump versions and remove unused files: - skalibs=2.3.2.0 - s6=2.1.3.0 --- skarnet-builder/build-latest | 4 +- skarnet-builder/build-latest-git | 132 ----------------------------- skarnet-builder/install-latest | 103 ---------------------- skarnet-builder/install-latest-git | 95 --------------------- 4 files changed, 2 insertions(+), 332 deletions(-) delete mode 100755 skarnet-builder/build-latest-git delete mode 100755 skarnet-builder/install-latest delete mode 100755 skarnet-builder/install-latest-git diff --git a/skarnet-builder/build-latest b/skarnet-builder/build-latest index 07bc22f..143e7dd 100755 --- a/skarnet-builder/build-latest +++ b/skarnet-builder/build-latest @@ -39,9 +39,9 @@ declare -A versions versions[make]=4.1 versions[linux]=3.18.5 versions[musl]=1.0.4 -versions[skalibs]=2.3.1.2 +versions[skalibs]=2.3.2.0 versions[execline]=2.1.1.0 -versions[s6]=2.1.2.0 +versions[s6]=2.1.3.0 versions[s6-portable-utils]=2.0.4.0 versions[s6-linux-utils]=2.0.2.0 versions[s6-dns]=2.0.0.2 diff --git a/skarnet-builder/build-latest-git b/skarnet-builder/build-latest-git deleted file mode 100755 index 56e429c..0000000 --- a/skarnet-builder/build-latest-git +++ /dev/null @@ -1,132 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -# make version (for skarnet) -make_version=4.1 - -# skarnet versions -musl_version=1.0.4 - -# point to make -MAKE_4x=/usr/local/bin/make - -# configures /dev/random in order to disable hangs -rm /dev/random -mknod /dev/random c 1 9 - -# create build dir -mkdir -p /build - -# install make -cd /build -curl -R -L -O http://ftp.gnu.org/gnu/make/make-${make_version}.tar.gz -tar xf make-${make_version}.tar.gz -cd make-${make_version} - -./configure -make -make install - -# install musl -cd /build -curl -R -L -O http://www.musl-libc.org/releases/musl-${musl_version}.tar.gz -tar xf musl-${musl_version}.tar.gz -cd musl-${musl_version} - -CFLAGS="-fno-toplevel-reorder -fno-stack-protector" \ - ./configure \ - --prefix=/usr/musl \ - --exec-prefix=/usr \ - --disable-shared -make -make install - -# install skalibs -cd /build -git clone https://github.com/skarnet/skalibs.git -cd skalibs - -CC="musl-gcc -static" \ - ./configure \ - --prefix=$HOME/usr \ - --enable-static-libc \ - --disable-shared - -# replace SKALIBS_ETC to "/etc" -sed -i '/.*SKALIBS_ETC.*/c\#define SKALIBS_ETC \"\/etc\"' src/include/skalibs/config.h - -${MAKE_4x} -${MAKE_4x} install - -# install execline -cd /build -git clone https://github.com/skarnet/execline.git -cd execline - -CC="musl-gcc -static" \ - ./configure \ - --prefix=$HOME/usr \ - --exec-prefix=$HOME/dist/execline/usr \ - --with-include=$HOME/usr/include \ - --with-lib=$HOME/usr/lib/skalibs \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -tar \ - -zcvf $HOME/dist/execline-latest-linux-amd64.tar.gz \ - -C $HOME/dist/execline \ - ./ - -# install s6 -cd /build -git clone https://github.com/skarnet/s6.git -cd s6 - -CC="musl-gcc -static" \ - ./configure \ - --prefix=$HOME/usr \ - --exec-prefix=$HOME/dist/s6/usr \ - --with-include=$HOME/usr/include \ - --with-lib=$HOME/usr/lib/skalibs \ - --with-lib=$HOME/usr/lib/execline \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -mkdir -p $HOME/dist/s6/etc -install -D -m644 $HOME/usr/etc/* $HOME/dist/s6/etc/ - -tar \ - -zcvf $HOME/dist/s6-latest-linux-amd64.tar.gz \ - -C $HOME/dist/s6 \ - ./ - -# install s6-portable-utils -cd /build -git clone https://github.com/skarnet/s6-portable-utils.git -cd s6-portable-utils - -CC="musl-gcc -static" \ - ./configure \ - --prefix=$HOME/usr \ - --exec-prefix=$HOME/dist/s6-portable-utils/usr \ - --with-include=$HOME/usr/include \ - --with-lib=$HOME/usr/lib/skalibs \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -tar \ - -zcvf $HOME/dist/s6-portable-utils-latest-linux-amd64.tar.gz \ - -C $HOME/dist/s6-portable-utils \ - ./ - -# copy results -cp $HOME/dist/execline-latest-linux-amd64.tar.gz /dist -cp $HOME/dist/s6-latest-linux-amd64.tar.gz /dist -cp $HOME/dist/s6-portable-utils-latest-linux-amd64.tar.gz /dist diff --git a/skarnet-builder/install-latest b/skarnet-builder/install-latest deleted file mode 100755 index 610b59e..0000000 --- a/skarnet-builder/install-latest +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -# make version (for skarnet) -make_version=4.1 - -# skarnet versions -musl_version=1.0.4 -skalibs_version=2.3.1.0 -execline_version=2.1.0.0 -s6_version=2.1.1.2 -s6_portable_utils_version=2.0.0.1 - -# point to make -MAKE_4x=/usr/local/bin/make - -# configures /dev/random in order to disable hangs -rm /dev/random -mknod /dev/random c 1 9 - -# create build dir -mkdir -p /build - -# install make -cd /build -curl -R -L -O http://ftp.gnu.org/gnu/make/make-${make_version}.tar.gz -tar xf make-${make_version}.tar.gz -cd make-${make_version} - -./configure -make -make install - -# install musl -cd /build -curl -R -L -O http://www.musl-libc.org/releases/musl-${musl_version}.tar.gz -tar xf musl-${musl_version}.tar.gz -cd musl-${musl_version} - -CFLAGS="-fno-toplevel-reorder -fno-stack-protector" \ - ./configure \ - --prefix=/usr/musl \ - --exec-prefix=/usr \ - --disable-shared -make -make install - -# install skalibs -cd /build -curl -R -L https://github.com/skarnet/skalibs/archive/v${skalibs_version}.tar.gz -o skalibs-${skalibs_version}.tar.gz -tar xf skalibs-${skalibs_version}.tar.gz -cd skalibs-${skalibs_version} - -CC="musl-gcc -static" \ - ./configure \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -# install execline -cd /build -curl -R -L https://github.com/skarnet/execline/archive/v${execline_version}.tar.gz -o execline-${execline_version}.tar.gz -tar xf execline-${execline_version}.tar.gz -cd execline-${execline_version} - -CC="musl-gcc -static" \ - ./configure \ - --with-lib=/usr/lib/skalibs \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -# install s6 -cd /build -curl -R -L https://github.com/skarnet/s6/archive/v${s6_version}.tar.gz -o s6-${s6_version}.tar.gz -tar xf s6-${s6_version}.tar.gz -cd s6-${s6_version} - -CC="musl-gcc -static" \ - ./configure \ - --with-lib=/usr/lib/skalibs \ - --with-lib=/usr/lib/execline \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -# install s6-portable-utils -cd /build -curl -R -L https://github.com/skarnet/s6-portable-utils/archive/v${s6_portable_utils_version}.tar.gz -o s6-portable-utils-${s6_portable_utils_version}.tar.gz -tar xf s6-portable-utils-${s6_portable_utils_version}.tar.gz -cd s6-portable-utils-${s6_portable_utils_version} - -CC="musl-gcc -static" \ - ./configure \ - --with-lib=/usr/lib/skalibs \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install diff --git a/skarnet-builder/install-latest-git b/skarnet-builder/install-latest-git deleted file mode 100755 index 8c07c7e..0000000 --- a/skarnet-builder/install-latest-git +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -# make version (for skarnet) -make_version=4.1 - -# skarnet versions -musl_version=1.0.4 - -# point to make -MAKE_4x=/usr/local/bin/make - -# configures /dev/random in order to disable hangs -rm /dev/random -mknod /dev/random c 1 9 - -# create build dir -mkdir -p /build - -# install make -cd /build -curl -R -L -O http://ftp.gnu.org/gnu/make/make-${make_version}.tar.gz -tar xf make-${make_version}.tar.gz -cd make-${make_version} - -./configure -make -make install - -# install musl -cd /build -curl -R -L -O http://www.musl-libc.org/releases/musl-${musl_version}.tar.gz -tar xf musl-${musl_version}.tar.gz -cd musl-${musl_version} - -CFLAGS="-fno-toplevel-reorder -fno-stack-protector" \ - ./configure \ - --prefix=/usr/musl \ - --exec-prefix=/usr \ - --disable-shared -make -make install - -# install skalibs -cd /build -git clone https://github.com/skarnet/skalibs.git -cd skalibs - -CC="musl-gcc -static" \ - ./configure \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -# install execline -cd /build -git clone https://github.com/skarnet/execline.git -cd execline - -CC="musl-gcc -static" \ - ./configure \ - --with-lib=/usr/lib/skalibs \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -# install s6 -cd /build -git clone https://github.com/skarnet/s6.git -cd s6 - -CC="musl-gcc -static" \ - ./configure \ - --with-lib=/usr/lib/skalibs \ - --with-lib=/usr/lib/execline \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install - -# install s6-portable-utils -cd /build -git clone https://github.com/skarnet/s6-portable-utils.git -cd s6-portable-utils - -CC="musl-gcc -static" \ - ./configure \ - --with-lib=/usr/lib/skalibs \ - --enable-static-libc \ - --disable-shared -${MAKE_4x} -${MAKE_4x} install