=== modified file 'bin/fsb' --- bin/fsb 2016-05-31 14:30:23 +0000 +++ bin/fsb 2015-04-22 09:27:14 +0000 @@ -103,8 +103,7 @@ fi die() { - (($#)) && fsb_error "$@" - (($+build_dir)) && print -r 'Interrupted in: '$build_dir +(($#)) && fsb_error "$@" exit 1 } === removed file 'clean_done' --- clean_done 2016-05-31 14:30:23 +0000 +++ clean_done 1970-01-01 00:00:00 +0000 @@ -1,13 +0,0 @@ -#!/bin/zsh -setopt extendedglob no_unset -cd $0:h/done || exit $? -current=( *(@) ) -keep=( $current:A:t ) - -for d in *(/); do - if (($+keep[(r)${d:t}])); then - print -r keep: $d - else - btrfs sub del $d - fi -done === modified file 'configs/amd64_hardened_server' --- configs/amd64_hardened_server 2016-05-31 14:30:23 +0000 +++ configs/amd64_hardened_server 2015-08-14 10:00:17 +0000 @@ -9,4 +9,3 @@ #STAGE_GENTOO_MIXINS="base nokit nodbus nox" STAGE_GENTOO_FLAVOR=server FSB_TARGET=gentoo_flavor -typeset -g -a STAGE_GENTOO_OVERLAYS === modified file 'configs/amd64_hardened_vshost' --- configs/amd64_hardened_vshost 2016-05-31 14:30:23 +0000 +++ configs/amd64_hardened_vshost 2015-04-22 09:24:39 +0000 @@ -1,4 +1,3 @@ source $0:h/amd64_hardened_server STAGE_GENTOO_FLAVOR=vshost FSB_TARGET=gentoo_bootloader -STAGE_GENTOO_OVERLAYS=( vserver-overlay ) === modified file 'configs/base' --- configs/base 2016-05-31 14:30:23 +0000 +++ configs/base 2014-10-29 14:11:53 +0000 @@ -1,12 +1,9 @@ # vim: ft=zsh noet -typeset -g STAGE_GENTOO_MIXINS -typeset -g -a STAGE_GENTOO_OVERLAYS - STAGE_GENTOO_BRANCH=testing STAGE_GENTOO_DEV=mdev STAGE_GENTOO_PORTAGE22=1 STAGE_GENTOO_NOPY3K=1 -#STAGE_GENTOO_MIXINS="base nokit nodbus" +STAGE_GENTOO_MIXINS="base nokit nodbus" #STAGE_GENTOO_GCC=4.8.2 -#STAGE_GENTOO_EMPTYTREE=1 +STAGE_GENTOO_EMPTYTREE=1 STAGE_GENTOO_FLAVOR=desktop === modified file 'configs/vserver' --- configs/vserver 2016-05-31 14:30:23 +0000 +++ configs/vserver 2015-04-22 09:24:39 +0000 @@ -1,6 +1,5 @@ -source $0:h/base STAGE_GENTOO_BRANCH=testing STAGE_GENTOO_DEV=minimal-dev -#STAGE_GENTOO_NOPY3K=1 +STAGE_GENTOO_NOPY3K=1 STAGE_GENTOO_FLAVOR=vserver FSB_TARGET=gentoo_flavor === modified file 'functions/fsb_infer_gentoo_settings' --- functions/fsb_infer_gentoo_settings 2016-05-31 14:30:23 +0000 +++ functions/fsb_infer_gentoo_settings 2014-10-29 14:11:53 +0000 @@ -38,7 +38,7 @@ : ${STAGE_PORTAGE_TS:=${$(> ${build_dir}/etc/apk/repositories || die "failed to set up apk" - apk_args+=( - --repository $FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/$repo - ) -done - -apk_args+=( +apk_args=( #--repository file://${STAGE_ALPINE_DOWN_DIR:h:a} - #--repository $FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/main - #--repository $FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/testing + --repository $FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/main + --repository $FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/testing --update-cache --root $build_dir --arch $STAGE_ALPINE_ARCH @@ -53,3 +36,5 @@ add alpine-base ) apk.static $apk_args || die "alpine init failed" +mkdir -p $build_dir/etc/apk || die "failed to set up apk" +print -rl - "$FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/"{main,testing} > ${build_dir}/etc/apk/repositories || die "failed to set up apk" === modified file 'functions/fsb_target_alpine_packages' --- functions/fsb_target_alpine_packages 2016-05-31 14:30:23 +0000 +++ functions/fsb_target_alpine_packages 2015-10-02 16:11:55 +0000 @@ -12,5 +12,5 @@ die "unimplemented action: $*" fi -$build_dir/chroot.sh /sbin/apk add --verbose $STAGE_ALPINE_PACKAGES || \ +$build_dir/chroot.sh /sbin/apk add $STAGE_ALPINE_PACKAGES || \ die "Could not install alpine packages: ${(j: :)${(q@)STAGE_ALPINE_PACKAGES}}" === modified file 'functions/fsb_target_gentoo_overlays' --- functions/fsb_target_gentoo_overlays 2016-05-31 14:30:23 +0000 +++ functions/fsb_target_gentoo_overlays 2014-10-29 14:11:53 +0000 @@ -4,30 +4,7 @@ FSB_INFO_DEPEND=gentoo_system FSB_INFO_BASE=%s FSB_INFO_BASE+=-pkg$STAGE_OVERLAY_REVNO[ccx-packages] - - [[ $parameters[STAGE_GENTOO_OVERLAYS] == 'array' ]] || \ - die "The array STAGE_GENTOO_OVERLAYS needs to be defined in the config" - local -A overlay_petnames - overlay_petnames=( - ccx-pypi pypi - vserver-overlay vs - ) - - local ovr - for ovr in $STAGE_GENTOO_OVERLAYS; do - if (($+overlay_petnames[$ovr])); then - FSB_INFO_BASE+=-$overlay_petnames[$ovr]$STAGE_OVERLAY_REVNO[$ovr] - else - FSB_INFO_BASE+=-$ovr-r$STAGE_OVERLAY_REVNO[$ovr] - fi - done - - # (( $+STAGE_GENTOO_OVERLAYS[ccx-pypi] )) && \ - # FSB_INFO_BASE+=-pypi$STAGE_OVERLAY_REVNO[ccx-pypi] - - # (( $+STAGE_GENTOO_OVERLAYS[vserver-overlay] )) && \ - # FSB_INFO_BASE+=-vs$STAGE_OVERLAY_REVNO[vserver-overlay] - + FSB_INFO_BASE+=-pypi$STAGE_OVERLAY_REVNO[ccx-pypi] FSB_INFO_DIR=%s return elif [[ $1 != build ]]; then @@ -35,12 +12,4 @@ fi fsb_gentoo_overlay_add ccx-packages -local ovr -for ovr in $STAGE_GENTOO_OVERLAYS; do - fsb_gentoo_overlay_add $ovr -done -# (( $+STAGE_GENTOO_OVERLAYS[ccx-pypi] )) && \ -# fsb_gentoo_overlay_add ccx-pypi -# (( $+STAGE_GENTOO_OVERLAYS[vserver-overlay] )) && \ -# fsb_gentoo_overlay_add vserver-overlay -return 0 +fsb_gentoo_overlay_add ccx-pypi === modified file 'functions/fsb_target_gentoo_python' --- functions/fsb_target_gentoo_python 2016-05-31 14:30:23 +0000 +++ functions/fsb_target_gentoo_python 2016-02-26 21:56:10 +0000 @@ -17,7 +17,7 @@ fsb_chroot_bash eselect python set python2.7 fsb_emerge -uvDN @world fsb_emerge -1u '=python-2.7*' python-updater portage -# fsb_emerge --depclean +fsb_emerge --depclean fsb_chroot_bash python-updater # emerge -1uN portage # fsb_emerge --unmerge '>=dev-lang/python-3'