=== modified file 'bin/fsb' --- bin/fsb 2017-12-07 07:16:35 +0000 +++ bin/fsb 2017-11-04 05:43:30 +0000 @@ -303,12 +303,6 @@ fi ln -s $build_dir:t $done_link || die "could create done-link ${(q)done_link}" tar -czpf ${done_link:a}.tar.gz.new -C $done_link . || die "could not create tarball" - if [[ -e $FSB_BASE_DIR/signify/key.sec ]]; then - signify -Sz -s $FSB_BASE_DIR/signify/key.sec -m ${done_link:a}.tar.gz.new -x ${done_link:a}.tar.gz.signed || die - rm ${done_link:a}.tar.gz.new - mv ${done_link:a}.tar.gz.signed ${done_link:a}.tar.gz || die - else - mv ${done_link:a}.tar.gz.new ${done_link:a}.tar.gz || die - fi + mv ${done_link:a}.tar.gz.new ${done_link:a}.tar.gz || die fsb_info "target available in: $done_link and ${done_link:a}.tar.gz" fi === removed file 'configs/alpine-amd64-edge_picker' --- configs/alpine-amd64-edge_picker 2017-12-07 07:16:35 +0000 +++ configs/alpine-amd64-edge_picker 1970-01-01 00:00:00 +0000 @@ -1,23 +0,0 @@ -: ${FSB_TARGET:=alpine_virtualenv} -source $0:h/alpine-amd64-edge -STAGE_ALPINE_PACKAGES=( - rsync mksh zsh runit findutils - gcc g++ binutils libc-dev make - libressl-dev - python2-dev - py2-serial - py-twisted - py2-docutils - py2-yaml - py2-sqlalchemy - graphviz - py2-psycopg2 - postgresql - py2-{setuptools,virtualenv,pip} -) -STAGE_ALPINE_VIRTUALENV_NAME=( picker ) -STAGE_ALPINE_VIRTUALENV_PACKAGES=( - /home/ccx/bzr/picker/dist/Picker-0.2.8.tar.gz - /home/ccx/tmp/distfiles/structuredconfig-0.1.tar.bz2 -) - === modified file 'functions/fsb_gentoo_post_update' --- functions/fsb_gentoo_post_update 2017-12-07 07:16:35 +0000 +++ functions/fsb_gentoo_post_update 2013-06-19 10:10:02 +0000 @@ -1,5 +1,5 @@ fsb_emerge --depclean fsb_gentoo_set_gcc # in case the current one was removed fsb_chroot_bash revdep-rebuild -#fsb_chroot_bash python-updater +fsb_chroot_bash python-updater fsb_chroot_bash perl-cleaner --all === modified file 'functions/fsb_target_gentoo_buildpkg' --- functions/fsb_target_gentoo_buildpkg 2017-12-07 07:16:35 +0000 +++ functions/fsb_target_gentoo_buildpkg 2017-05-31 14:45:10 +0000 @@ -11,7 +11,7 @@ die "unimplemented action: $*" fi -local pkgdir f +local pkgdir pkgdir=$FSB_BASE_DIR/packages/$FSB_TARGET_NAME mkdir -p $pkgdir || die "Could not make directory: $pkgdir" mkdir -p $build_dir/var/portage/packages \ @@ -22,8 +22,3 @@ $build_dir/chroot.sh /bin/bash --login \ -c 'eix-installed -= -a | xargs quickpkg --include-unmodified-config y' \ || die "Building binary packages failed" -if [[ -e $FSB_BASE_DIR/signify/key.sec ]]; then - for f in $FSB_BASE_DIR/packages/$FSB_TARGET_NAME/**/(Packages|*.tbz2)(.); do - signify -S -s $FSB_BASE_DIR/signify/key.sec -m $f -x $f.sig || die "Failed to sign: ${(qqq)f}" - done -fi === modified file 'functions/fsb_target_gentoo_python' --- functions/fsb_target_gentoo_python 2017-12-07 07:16:35 +0000 +++ functions/fsb_target_gentoo_python 2017-10-12 23:31:06 +0000 @@ -16,16 +16,12 @@ fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/nopy3k fsb_chroot_bash eselect python set python2.7 fsb_emerge_hackfix --backtrack=35 -uvDN @world - -## Mike Gilbert (13 Nov 2017) -## python-updater is obsolete. Utilize PYTHON_TARGETS... -#fsb_emerge -n python-updater -#grep -q python-updater $build_dir/var/lib/portage/world \ -# || die "failed to add python-updater to world" - +fsb_emerge -n python-updater +grep -q python-updater $build_dir/var/lib/portage/world \ + || die "failed to add python-updater to world" fsb_emerge -1u '=python-2.7*' portage # fsb_emerge --depclean -#fsb_chroot_bash python-updater +fsb_chroot_bash python-updater # emerge -1uN portage # fsb_emerge --unmerge '>=dev-lang/python-3' # fsb_chroot_bash python-updater