=== modified file 'stagebuilder.pl' --- stagebuilder.pl 2012-03-09 13:35:26 +0000 +++ stagebuilder.pl 2012-03-09 10:24:30 +0000 @@ -585,52 +585,29 @@ target(amd64_vserver_base, Dir) --> amd64_hardened_vserver(amd64_vserver_base, [], Dir). -target(Name, Dir) --> % stable +target(Name, Dir) --> create_gentoo_builddir(StageName, Dir), { dir_make_conf(Dir, Make_conf) , site_conf_file('make.conf', Site_conf) }, - target_gentoo(BaseName, StageName, StageMax, Dir, [ + target_gentoo(BaseName, StageName, Dir, [ run_append([cat, Site_conf], Make_conf) ]), {appendn(BaseName, '_stable', Name)}, - gentoo_build_stages(Name, Dir, StageMax, 0, _). + gentoo_build_stage5(Name, Dir). -target(Name, Dir) --> % testing +target(Name, Dir) --> create_gentoo_builddir(StageName, Dir), { gentoo_stage(StageName, ArchName, _) , dir_make_conf(Dir, Make_conf) , site_conf_file('make.conf', Site_conf) }, - target_gentoo(BaseName, StageName, StageMax, Dir, [ + target_gentoo(BaseName, StageName, Dir, [ echo_append('ACCEPT_KEYWORDS="~'+ArchName+'"', Make_conf), run_append([cat, Site_conf], Make_conf) ]), {appendn(BaseName, '_testing', Name)}, - gentoo_build_stages(Name, Dir, StageMax, 1, _). - -gentoo_build_stages(Name, Dir, 3, 0, PortageVer) --> - [comment('build stages')], - get_portage_timestamp(Dir, PortageVer), - [chroot(Dir, ['/root/prosys/update_stage3.sh'])], - create_stage(Name + '_stage3-p' + PortageVer, Dir). - -gentoo_build_stages(Name, Dir, 3, 1, PortageVer) --> - [comment('build stages')], - get_portage_timestamp(Dir, PortageVer), - [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])], - create_stage(Name + '_stage3-p' + PortageVer, Dir). - -gentoo_build_stages(Name, Dir, 4, Rebuild, PortageVer) --> - gentoo_build_stages(Name, Dir, 3, Rebuild, PortageVer), - {script_dir(Script)}, - [run([Script +/+ build_gentoo_stage4, Dir])], - create_stage(Name + '_stage4-p' + PortageVer, Dir). - -gentoo_build_stages(Name, Dir, 5, Rebuild, PortageVer) --> - gentoo_build_stages(Name, Dir, 4, Rebuild, PortageVer), - [chroot(Dir, ['/root/prosys/build_stage5.sh'])], - create_stage(Name + '_stage5-p' + PortageVer, Dir). + gentoo_build_stage4(Name, Dir). appendn(Start, End, Whole) :- name(Start, StartS), @@ -638,7 +615,7 @@ append(StartS, EndS, WholeS), name(Whole, WholeS). -target_gentoo(k8_x11, i686, 5, Dir, AddCommands) --> +target_gentoo(k8_x11, i686, Dir, AddCommands) --> reset_make_conf(Dir, '-O2 -march=i686 -mcpu=k8 -pipe -fomit-frame-pointer' , '${CFLAGS}', 'i686-pc-linux-gnu'), prepend(AddCommands), @@ -650,7 +627,7 @@ base_x11, base_media ]). -target_gentoo(amd64_x11, amd64, 5, Dir, AddCommands) --> +target_gentoo(amd64_x11, amd64, Dir, AddCommands) --> reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}' ,'amd64-pc-linux-gnu'), prepend(AddCommands), @@ -662,7 +639,7 @@ base_x11, base_media ]). -target_gentoo(atom_eeepc, i686, 5, Dir, AddCommands) --> +target_gentoo(atom_eeepc, i686, Dir, AddCommands) --> reset_make_conf(Dir, '-Os -march=prescott -pipe -fomit-frame-pointer' , '${CFLAGS}', 'i686-pc-linux-gnu'), prepend(AddCommands),