moving first upgrade to stage3, our base will be a clean image that can be used for normal tasks which doesn't require kernel

ext/locale.nopurge

@@ -0,0 +1,3 @@
+en
+en_US.UTF-8
+en_US

script/equo-rescue-generate.exp

@@ -1,26 +0,0 @@
-#!/usr/bin/expect -f
-
-# no need for timeout 1
-set timeout -1
-
-spawn equo rescue generate
-
-expect  {
-   "*Understood*" { send "Yes\r\n" ; exp_continue }
-   "*Really*" { send "Yes\r\n" ; exp_continue } 
-   "*Ok*" { send "Yes\r\n" ; exp_continue } 
-   "*generation complete*" { sleep 3; send "exit\r"; exit }
-#    timeout  { puts "timed out during generation"; exit 1 }
-}
-
-expect EOF
-
-puts $expect_out(buffer)
-
-lassign [wait] pid spawnid os_error_flag value
-
-if {$os_error_flag == 0} {
-    puts "exit status: $value"
-} else {
-    puts "errno: $value"
-}

script/generate-equo-db.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-mkdir -p /var/lib/entropy/client/database/amd64
-cd /var/lib/entropy/client/database/amd64
-cat /equo.sql | sqlite3 equo.db
-
-# remove files used to generate a correct equo db
-rm -rfv /equo.sql
-rm -rfv /generate-equo-db.sh

script/post-update.sh

@@ -107,20 +107,10 @@ FILES_TO_REMOVE=(
     "/usr/portage/licenses"
 )
 
-mkdir -p /etc/portage/repos.conf/
-echo "[DEFAULT]
-main-repo = gentoo
-
-[gentoo]
-location = /usr/portage
-sync-type = rsync
-sync-uri = rsync://rsync.europe.gentoo.org/gentoo-portage
-" > /etc/portage/repos.conf/gentoo.conf
-
 # Upgrading packages
 
 rsync -av "rsync://rsync.at.gentoo.org/gentoo-portage/licenses/" "/usr/portage/licenses/" && ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept && \
-equo u && \
+equo up && equo u && \
 echo -5 | equo conf update
 
 # Cleanup

script/sabayon-configuration-build.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-# fetch the bits!
-cd /opt
-git clone git://github.com/Sabayon/build.git sabayon-build
-cd /opt/sabayon-build/conf/intel/portage
-# keep your specific stuff in "myconf" branch:
-git checkout -b myconf
-# symlink to your <arch>:
-ln -sf make.conf.amd64 make.conf
-ln -sf package.env.amd64 package.env
-# add & commit
-git add make.conf package.env
-git config --global user.name "root"
-git config --global user.email "root@localhost"
-git commit -m "saving my configurations"
-# rename the gentoo /etc/make.conf and /etc/portage/:
-cd /etc/
-mv portage portage-gentoo
-#mv make.conf make.conf-gentoo
-# symlink to sabayon /etc/make.conf /etc/portage/:
-ln -sf /opt/sabayon-build/conf/intel/portage portage

script/sabayon-configuration.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Setting locale.conf
-for f in /etc/env.d/02locale /etc/locale.conf; do
-    echo LANG=en_US.UTF-8 > "${f}"
-    echo LANGUAGE=en_US.UTF-8 >> "${f}"
-    echo LC_ALL=en_US.UTF-8 >> "${f}"
-done
-
-#echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen &&  locale-gen &&  eselect locale set en_US.utf8 && env-update && source /etc/profile
-
-# Defyning /usr/local/portage configuration
-mkdir /usr/local/portage
-mkdir -p /usr/local/portage/metadata/
-mkdir -p /usr/local/portage/profiles/
-echo "masters = gentoo" > /usr/local/portage/metadata/layout.conf
-echo "user_defined" > /usr/local/portage/profiles/repo_name
-
-mkdir -p /etc/portage/package.keywords/
-echo "app-admin/equo ~amd64
-sys-apps/entropy ~amd64
-" > /etc/portage/package.keywords/00-sabayon.package.keywords
-
-mkdir -p /etc/portage/package.use/
-echo "dev-lang/python sqlite
-sys-apps/file python
-" > /etc/portage/package.use/00-sabayon.package.use
-
-
-# emerging equo and expect
-USE="ncurses" emerge -j -vt equo --autounmask-write || exit 1
-emerge -j expect || exit 1
-
-# Enforce choosing only python2.7 for now, cleaning others
-eselect python set python2.7
-
-# Specifying a gentoo profile
-eselect profile set default/linux/amd64/13.0/desktop
-
-# default for next stage(s)
-echo "nameserver 8.8.8.8" > /etc/resolv.conf
-
-# set default shell
-chsh -s /bin/bash
-
-rm -rf /etc/make.profile