diff options
| -rwxr-xr-x | bootstrap.sh | 12 | ||||
| -rwxr-xr-x | xib.sh | 9 |
2 files changed, 7 insertions, 14 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 974dd86..e4a041b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,7 +23,6 @@ bison bzip2 sbase sort -ubase findutils diffutils gettext @@ -35,9 +34,7 @@ perl sed tar texinfo -xz -flex -toolchain-cmake +cmake-toolchain ninja " @@ -52,14 +49,15 @@ bootstrap () { parent=$(basename $pkg_build) [ ! -d "$stage/$parent" ] && mkdir -p $stage/$parent [ ! -f $stage/$parent/$pkg.xipkg ] && { - xibuild -v -k $keychain/$priv_key -c $pkg_build -d $stage/$parent -r $chroot || return 1 + xibuild -nv -k $keychain/$priv_key -C $pkg_build -d $stage/$parent -r $chroot || return 1 } echo "Installing $pkg" - xi -r $toolchaindest install $stage/$parent/$pkg.xipkg + xi -nyl -r $toolchaindest install $stage/$parent/$pkg.xipkg done - printf "creating tarball...\n" + printf "creating tarball..." output="xib-chroot-tools-$(date +%y%m%d).tar.xz" tar -C $toolchaindest -cJf $output ./ + printf "Complete!\n" } @@ -85,19 +85,14 @@ build_package () { rm -rf $stage mkdir -p $stage - xibuild -v -k $keychain/$priv_key -c $1 -d $stage -r $chroot || return 1 + xibuild -v -k $keychain/$priv_key -C $1 -d $stage -r $chroot || return 1 get_buildfiles_hash $1 > $stage/$name.xibsum } package_install () { local name=$1 local xipkg=$2 - SYSROOT=$3 - INSTALLED_DIR="$chroot/var/lib/xipkg/installed/" - VERBOSE=false - - install_package $xipkg $name && printf "${PASS}${CHECKMARK}\n" || printf "${NEUTRAL}${CHECKMARK}\n" - run_postinstall + xipkg -lny -r $3 install $xipkg && printf "${PASS}${CHECKMARK}\n" || printf "${NEUTRAL}${CHECKMARK}\n" } # get the direct dependencies of a single package |