home/skaware
2
0
Fork 0
mirror of https://github.com/wahyd4/skaware.git synced 2026-08-09 04:35:57 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from just-containers/pinpoint-merge

Browse Source 
Added s6-rc to the build
This commit is contained in:
John Regan
2016-06-13 11:09:40 -05:00
committed by GitHub
parent 0ec8d911a9 30d774f55a
commit 5f360e1bbc
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skarnet-builder/build-latest
+9 -2
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env bash
set -e
set -x
@@ -21,6 +21,7 @@ s6-portable-utils
s6-linux-utils
s6-dns
s6-networking
s6-rc
)
# linux packages
@@ -32,6 +33,7 @@ skalibs
execline
s6
s6-portable-utils
s6-rc
)
# software versions
@@ -48,6 +50,7 @@ versions[s6-portable-utils]=2.0.6.0
versions[s6-linux-utils]=2.1.0.0
versions[s6-dns]=2.0.1.0
versions[s6-networking]=2.1.1.0
versions[s6-rc]=0.0.3.0
declare -A includes
includes[skalibs]="--with-include=$PACKAGEDIR/musl/include"
@@ -57,6 +60,7 @@ includes[s6-portable-utils]="${includes[s6]}"
includes[s6-linux-utils]="--with-include=$PACKAGEDIR/linux-headers/include ${includes[s6]}"
includes[s6-dns]="${includes[s6]}"
includes[s6-networking]="--with-include=$PACKAGEDIR/s6-dns/usr/include --with-include=$PACKAGEDIR/s6/usr/include ${includes[s6]}"
includes[s6-rc]="--with-include=$PACKAGEDIR/s6/usr/include ${includes[s6]}"
declare -A libs
libs[skalibs]="--with-lib=/usr/musl/lib"
@@ -66,6 +70,7 @@ libs[s6-portable-utils]="${libs[s6]}"
libs[s6-linux-utils]="${libs[s6]}"
libs[s6-dns]="${libs[s6]}"
libs[s6-networking]="--with-lib=$PACKAGEDIR/s6-dns/usr/lib --with-lib=$PACKAGEDIR/s6/usr/lib ${libs[s6]}"
libs[s6-rc]="--with-lib=$PACKAGEDIR/s6/usr/lib ${libs[s6]}"
declare -A sysdeps
sysdeps[skalibs]=""
@@ -75,6 +80,7 @@ sysdeps[s6-portable-utils]="${sysdeps[execline]}"
sysdeps[s6-linux-utils]="${sysdeps[execline]}"
sysdeps[s6-dns]="${sysdeps[execline]}"
sysdeps[s6-networking]="${sysdeps[execline]}"
sysdeps[s6-rc]="${sysdeps[execline]}"
declare -A configopts
configopts[skalibs]="--datadir=/etc --enable-force-devr"
@@ -83,6 +89,7 @@ configopts[s6]=""
configopts[s6-portable-utils]=""
configopts[s6-dns]=""
configopts[s6-networking]=""
configopts[s6-rc]=""
declare -A manifests
manifests[skarnet_all_packages]="manifest.txt"
@@ -101,7 +108,7 @@ build_install_skarnet_package() {
version=$(git rev-list -n 1 v${version})
fi
git reset --hard ${version}
CC="$PACKAGEDIR/musl/bin/musl-gcc" ./configure \
--libdir=/usr/lib \
--enable-static \