=== modified file 'configs/alpine-amd64-edge'
--- configs/alpine-amd64-edge	2015-08-14 10:00:17 +0000
+++ configs/alpine-amd64-edge	2014-10-29 14:11:53 +0000
@@ -1,3 +1,3 @@
-: ${FSB_TARGET:=alpine_packages}
 STAGE_ALPINE_ARCH=x86_64
 STAGE_ALPINE_RELEASE=edge
+

=== modified file 'configs/amd64_hardened_server'
--- configs/amd64_hardened_server	2015-08-14 10:00:17 +0000
+++ configs/amd64_hardened_server	2014-10-29 14:11:53 +0000
@@ -1,7 +1,6 @@
 # vim: ft=zsh noet
 STAGE_GENTOO_NAME=latest-stage3-amd64-hardened+nomultilib
 STAGE_GENTOO_PROFILE=hardened/linux/amd64/no-multilib
-STAGE_GENTOO_PKGCACHE_SUFFIX=-hardened
 #STAGE_GENTOO_BRANCH=testing
 STAGE_GENTOO_DEV=mdev
 #STAGE_GENTOO_PORTAGE22=1

=== modified file 'configs/amd64_hardened_vserver'
--- configs/amd64_hardened_vserver	2015-08-14 10:00:17 +0000
+++ configs/amd64_hardened_vserver	2014-10-29 14:11:53 +0000
@@ -1,4 +1,3 @@
 source $0:h/vserver
 STAGE_GENTOO_NAME=latest-stage3-amd64-hardened+nomultilib
 STAGE_GENTOO_PROFILE=hardened/linux/amd64/no-multilib
-STAGE_GENTOO_PKGCACHE_SUFFIX=-hardened

=== modified file 'configs/amd64_vserver'
--- configs/amd64_vserver	2015-08-14 10:00:17 +0000
+++ configs/amd64_vserver	2013-05-21 17:20:11 +0000
@@ -1,3 +1,2 @@
 source $0:h/vserver
 STAGE_GENTOO_NAME=latest-stage3-amd64
-STAGE_GENTOO_PROFILE=default/linux/amd64/13.0

=== modified file 'functions/fsb_target_alpine_init'
--- functions/fsb_target_alpine_init	2015-08-14 10:00:17 +0000
+++ functions/fsb_target_alpine_init	2014-10-29 14:11:53 +0000
@@ -27,7 +27,6 @@
 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
 	--update-cache
 	--root $build_dir
 	--arch $STAGE_ALPINE_ARCH
@@ -37,4 +36,4 @@
 )
 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"
+print -r - "$FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/main" > ${build_dir}/etc/apk/repositories || die "failed to set up apk"

=== modified file 'functions/fsb_target_gentoo_bootloader'
--- functions/fsb_target_gentoo_bootloader	2015-08-14 10:00:17 +0000
+++ functions/fsb_target_gentoo_bootloader	2015-04-22 09:24:39 +0000
@@ -29,20 +29,18 @@
 DEFAULT genkernel.vga
 
 LABEL genkernel.vga
-KERNEL /kernel
-APPEND initrd=/initramfs dolvm domdadm vga=792
+KERNEL kernel
+APPEND initrd=initramfs dolvm domdadm vga=792
 
 LABEL genkernel
-KERNEL /kernel
-APPEND initrd=/initramfs dolvm domdadm
+KERNEL kernel
+APPEND initrd=initramfs dolvm domdadm
 
 LABEL genkernel.old
-KERNEL /kernel.old
-APPEND initrd=/initramfs.old dolvm domdadm
+KERNEL kernel.old
+APPEND initrd=initramfs.old dolvm domdadm
 EOF
-cp -Rv $build_dir/usr/share/syslinux $build_dir/boot/ || \
+cp -v $build_dir/usr/share/extlinux/*.c32 $build_dir/boot/ || \
 	die "error copying extlinux/syslinux modules"
-ln -s ../extlinux.conf $build_dir/boot/syslinux/ || \
-	die "error symlinking exlinux modules"
 [[ -h $build_dir/boot/boot ]] || ln -s . $build_dir/boot/boot || \
 	die "could not make recursive boot symlink"

=== modified file 'functions/fsb_target_gentoo_gcc'
--- functions/fsb_target_gentoo_gcc	2015-08-14 10:00:17 +0000
+++ functions/fsb_target_gentoo_gcc	2015-04-22 09:24:39 +0000
@@ -8,10 +8,8 @@
 	die "unimplemented action: $*"
 fi
 
-local pkgcache
-pkgcache=$FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE${STAGE_GENTOO_PKGCACHE_SUFFIX:-}
-if [[ -d $pkgcache ]]; then
-	rsync -r $pkgcache/ $build_dir/var/portage/packages/ || die "error copying packages from cache"
+if [[ -d $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE ]]; then
+	rsync -r $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE/ $build_dir/var/portage/packages/ || die "error copying packages from cache"
 fi
 
 if (($+STAGE_GENTOO_GCC)); then
@@ -22,7 +20,7 @@
 	fsb_emerge -1ubk sys-devel/gcc
 fi
 
-mkdir -p $pkgcache
-rsync -r $build_dir/var/portage/packages/ $pkgcache/ || die "error copying packages to cache"
+mkdir -p $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE
+rsync -r $build_dir/var/portage/packages/ $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE/ || die "error copying packages to cache"
 
 fsb_gentoo_set_gcc

=== modified file 'functions/fsb_target_gentoo_genkernel'
--- functions/fsb_target_gentoo_genkernel	2015-08-14 10:00:17 +0000
+++ functions/fsb_target_gentoo_genkernel	2015-04-22 09:24:39 +0000
@@ -11,9 +11,6 @@
 fsb_chroot_bash emerge -n genkernel
 sed --in-place=.orig -f $FSB_SCRIPTS_DIR/genkernel_conf.sed $build_dir/etc/genkernel.conf || \
 	die "failed to configure genkernel"
-fsb_chroot_bash genkernel kernel --no-mountboot || die "genkernel failure"
-# possible symlink attack :-/
-ed -s $build_dir/usr/src/linux/.config <$FSB_SCRIPTS_DIR/kernel_conf.ed || die '.config ed script failed'
 fsb_chroot_bash genkernel --lvm --mdadm --e2fsprogs --disklabel \
 	--no-mountboot --symlink --real-root=/dev/mapper/vg-root \
 	all