=== modified file 'configs/alpine-amd64-edge' --- configs/alpine-amd64-edge 2017-04-11 16:44:24 +0000 +++ configs/alpine-amd64-edge 2015-08-14 10:00:17 +0000 @@ -1,4 +1,3 @@ : ${FSB_TARGET:=alpine_packages} STAGE_ALPINE_ARCH=x86_64 STAGE_ALPINE_RELEASE=edge -STAGE_ALPINE_REPOSITORIES=( main testing community ) === removed file 'configs/alpine-amd64-edge_chat' --- configs/alpine-amd64-edge_chat 2017-04-11 16:44:24 +0000 +++ configs/alpine-amd64-edge_chat 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -source $0:h/alpine-amd64-edge -STAGE_ALPINE_PACKAGES=( rsync mksh zsh findutils znc znc-extra znc-modpython bitlbee bitlbee-otr weechat weechat-{python,perl,lua,aspell} ) -STAGE_ALPINE_REPOSITORIES=( main testing ) === removed file 'configs/alpine-amd64-edge_prosody' --- configs/alpine-amd64-edge_prosody 2017-04-11 16:44:24 +0000 +++ configs/alpine-amd64-edge_prosody 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -source $0:h/alpine-amd64-edge -STAGE_ALPINE_PACKAGES=( rsync mksh zsh runit findutils prosody ) === modified file 'configs/alpine-amd64-edge_unbound' --- configs/alpine-amd64-edge_unbound 2017-04-11 16:44:24 +0000 +++ configs/alpine-amd64-edge_unbound 2016-02-26 21:56:10 +0000 @@ -1,3 +1,3 @@ source $0:h/alpine-amd64-edge -STAGE_ALPINE_PACKAGES=( rsync mksh zsh findutils dnssec-root unbound ) -STAGE_ALPINE_REPOSITORIES=( main testing ) +STAGE_ALPINE_PACKAGES=( rsync mksh zsh runit findutils dnssec-root unbound ) + === modified file 'configs/alpine-x86-edge' --- configs/alpine-x86-edge 2017-04-11 16:44:24 +0000 +++ configs/alpine-x86-edge 2014-10-29 14:11:53 +0000 @@ -1,4 +1,3 @@ -: ${FSB_TARGET:=alpine_packages} STAGE_ALPINE_ARCH=x86 STAGE_ALPINE_RELEASE=edge === removed file 'configs/alpine-x86-edge_router' --- configs/alpine-x86-edge_router 2017-04-11 16:44:24 +0000 +++ configs/alpine-x86-edge_router 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -source $0:h/alpine-x86-edge -STAGE_ALPINE_PACKAGES=( rsync mksh zsh findutils dnssec-root unbound dhcp dhcpcd s6 s6-networking ppp syslinux iptables e2fsprogs xfsprogs minicom ntop htop collectd{,-{network,iptables,snmp}} linux-grsec util-linux ) -STAGE_ALPINE_REPOSITORIES=( main testing ) === removed file 'configs/amd64_desktop_minimal' --- configs/amd64_desktop_minimal 2017-04-11 16:44:24 +0000 +++ configs/amd64_desktop_minimal 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -source $0:h/desktop_thin -STAGE_GENTOO_NAME=latest-stage3-amd64 -STAGE_GENTOO_PROFILE=default/linux/amd64/13.0 -STAGE_GENTOO_FLAVOR=minimal-desktop === modified file 'configs/amd64_hardened_vserver' --- configs/amd64_hardened_vserver 2017-04-11 16:44:24 +0000 +++ configs/amd64_hardened_vserver 2015-08-14 10:00:17 +0000 @@ -2,4 +2,3 @@ STAGE_GENTOO_NAME=latest-stage3-amd64-hardened+nomultilib STAGE_GENTOO_PROFILE=hardened/linux/amd64/no-multilib STAGE_GENTOO_PKGCACHE_SUFFIX=-hardened -# vim: ft=zsh noet === removed file 'configs/amd64_hardened_vserver_acme-client' --- configs/amd64_hardened_vserver_acme-client 2017-04-11 16:44:24 +0000 +++ configs/amd64_hardened_vserver_acme-client 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ -source $0:h/amd64_hardened_vserver -STAGE_GENTOO_FLAVOR=vserver-acme-client -#STAGE_GENTOO_EMPTYTREE=1 -#STAGE_GENTOO_BRANCH=stable -STAGE_GENTOO_BRANCH=testing -# vim: ft=zsh noet === modified file 'configs/desktop' --- configs/desktop 2017-04-11 16:44:24 +0000 +++ configs/desktop 2015-10-02 16:11:55 +0000 @@ -1,4 +1,3 @@ -source $0:h/base STAGE_GENTOO_BRANCH=testing STAGE_GENTOO_DEV=mdev STAGE_GENTOO_PORTAGE22=1 === modified file 'configs/vserver' --- configs/vserver 2017-04-11 16:44:24 +0000 +++ configs/vserver 2016-05-31 14:30:23 +0000 @@ -4,4 +4,3 @@ #STAGE_GENTOO_NOPY3K=1 STAGE_GENTOO_FLAVOR=vserver FSB_TARGET=gentoo_flavor -# vim: ft=zsh noet === modified file 'functions/fsb_emerge' --- functions/fsb_emerge 2017-04-11 16:44:24 +0000 +++ functions/fsb_emerge 2016-02-26 21:56:10 +0000 @@ -2,4 +2,4 @@ : ${FSB_EMERGE_JOBS:=$(cat /proc/cpuinfo | grep '^processor' | wc -l)} # disable userpriv as cmake has trouble with non-readable/setuid executables # gentoo bug 486270, https://cmake.org/Bug/view.php?id=10468 -fsb_chroot_bash FEATURES=-userpriv emerge --jobs $FSB_EMERGE_JOBS --verbose-conflicts "$@" +fsb_chroot_bash FEATURES=-userpriv emerge --jobs $FSB_EMERGE_JOBS "$@" === modified file 'functions/fsb_target_gentoo_gcc' --- functions/fsb_target_gentoo_gcc 2017-04-11 16:44:24 +0000 +++ functions/fsb_target_gentoo_gcc 2016-07-12 08:34:05 +0000 @@ -25,15 +25,12 @@ if ! $build_dir/chroot.sh /usr/bin/binutils-config -l; then - fsb_emerge -1bk --binpkg-changed-deps=y --backtrack=50 binutils - fsb_emerge -1bk --binpkg-changed-deps=y --backtrack=50 $gcc_pkg + fsb_emerge -1bk binutils + fsb_emerge -1bk $gcc_pkg else - fsb_emerge -1ubk --binpkg-changed-deps=y --backtrack=50 binutils $gcc_pkg + fsb_emerge -1ubk binutils $gcc_pkg fi -fsb_emerge -1ubk sys-apps/texinfo -fsb_chroot_bash perl-cleaner --all - mkdir -p $pkgcache rsync -r $build_dir/var/portage/packages/ $pkgcache/ || die "error copying packages to cache" === modified file 'functions/fsb_target_gentoo_python' --- functions/fsb_target_gentoo_python 2017-04-11 16:44:24 +0000 +++ functions/fsb_target_gentoo_python 2016-07-12 10:22:43 +0000 @@ -15,11 +15,8 @@ fsb_emerge -1uN portage fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/nopy3k fsb_chroot_bash eselect python set python2.7 -fsb_emerge --backtrack=35 -uvDN @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 -uvDN @world +fsb_emerge -1u '=python-2.7*' python-updater portage # fsb_emerge --depclean fsb_chroot_bash python-updater # emerge -1uN portage === modified file 'functions/fsb_target_gentoo_system' --- functions/fsb_target_gentoo_system 2017-04-11 16:44:24 +0000 +++ functions/fsb_target_gentoo_system 2015-06-19 16:54:27 +0000 @@ -20,7 +20,6 @@ fsb_emerge -u1 perl fsb_chroot_bash perl-cleaner --all fsb_emerge -uDN @world - fsb_emerge -uDN --with-bdeps=y @world fi fsb_emerge -n gentoolkit sed -i '/circlebreak/d' $build_dir/var/portage/local/profiles/custom/parent || die