=== modified file '.bzrignore' --- .bzrignore 2012-03-01 22:00:47 +0000 +++ .bzrignore 2012-01-18 00:23:46 +0000 @@ -1,4 +1,1 @@ targets -downloads -stages -build === modified file 'conf/chroot.sh-amd64' --- conf/chroot.sh-amd64 2012-03-01 22:00:47 +0000 +++ conf/chroot.sh-amd64 2012-01-18 17:27:32 +0000 @@ -39,10 +39,10 @@ #set -x -trymount --bind {/,}dev +#trymount --bind {/,}dev mkdir -v -p dev/{pts,shm} trymount -t devpts devpts dev/pts -trymount -t tmpfs -o size=100M tmpfs dev/shm +trymount -t tmpfs tmpfs dev/shm trymount -t proc none proc @@ -53,8 +53,8 @@ [[ -d var/portage/ccache ]] && \ trymount --bind /var/prosys/ccache/amd64 var/portage/ccache -#trymount -t tmpfs -o size=3G tmpfs var/tmp -#trymount -t tmpfs -o size=100M tmpfs tmp +trymount -t tmpfs -o size=3G tmpfs var/tmp +trymount -t tmpfs tmpfs tmp cp -v /etc/resolv.conf etc/ cat proc/mounts >etc/mtab === modified file 'conf/chroot.sh-x86' --- conf/chroot.sh-x86 2012-03-01 22:00:47 +0000 +++ conf/chroot.sh-x86 2012-01-20 04:29:24 +0000 @@ -39,10 +39,10 @@ #set -x -trymount --bind {/,}dev +#trymount --bind {/,}dev mkdir -v -p dev/{pts,shm} trymount -t devpts devpts dev/pts -trymount -t tmpfs -o size=100M tmpfs dev/shm +trymount -t tmpfs tmpfs dev/shm trymount -t proc none proc @@ -53,8 +53,8 @@ [[ -d var/portage/ccache ]] && \ trymount --bind /var/prosys/ccache/amd64 var/portage/ccache -#trymount -t tmpfs -o size=7G tmpfs var/tmp -#trymount -t tmpfs -o size=500M tmpfs tmp +trymount -t tmpfs -o size=3G tmpfs var/tmp +trymount -t tmpfs tmpfs tmp cp -v /etc/resolv.conf etc/ cat proc/mounts >etc/mtab === removed file 'conf/gentoo_scripts/build_stage5.sh' --- conf/gentoo_scripts/build_stage5.sh 2012-03-01 22:00:47 +0000 +++ conf/gentoo_scripts/build_stage5.sh 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -#!/bin/bash -PS4='+\t \s> ' -emerge ${KERNEL_SOURCES:-gentoo-sources} genkernel && genkernel all === removed file 'conf/gentoo_scripts/rebuild_stage3_uclibc.sh' --- conf/gentoo_scripts/rebuild_stage3_uclibc.sh 2012-03-01 22:00:47 +0000 +++ conf/gentoo_scripts/rebuild_stage3_uclibc.sh 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -#!/bin/bash -emerge() { - /usr/bin/emerge --quiet-build=y --verbose --keep-going $@ -} -PS4='+\t \s> ' -set -x -env-update && \ -source /etc/profile && \ -emerge portage uclibc && \ -/usr/portage/scripts/bootstrap.sh && \ -gcc-config `gcc-config -l | awk '{p=$2} END{print p}'` && \ -source /etc/profile && \ -emerge -e @world && \ -emerge -n gentoolkit && \ -/usr/bin/emerge --depclean && \ -emerge @preserved-rebuild && \ -revdep-rebuild -- -qv --keep-going === removed file 'conf/gentoo_scripts/rm_py3k.sh' --- conf/gentoo_scripts/rm_py3k.sh 2012-03-01 22:00:47 +0000 +++ conf/gentoo_scripts/rm_py3k.sh 1970-01-01 00:00:00 +0000 @@ -1,12 +0,0 @@ -#!/bin/bash -PS4='+\t \s> ' -set -x -env-update && \ -source /etc/profile && \ -emerge portage ccache && \ -source /etc/profile && \ -emerge -1u '=python-2.7*' python-updater portage && \ -eselect python set python2.7 && \ -source /etc/profile && \ -emerge --unmerge '>=dev-lang/python-3' && \ -python-updater === removed file 'conf/gentoo_scripts/update_stage3.sh' --- conf/gentoo_scripts/update_stage3.sh 2012-03-01 22:00:47 +0000 +++ conf/gentoo_scripts/update_stage3.sh 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -#!/bin/bash -emerge() { - /usr/bin/emerge --quiet-build=y --verbose --keep-going $@ -} -PS4='+\t \s> ' -set -x -env-update && \ -source /etc/profile && \ -emerge portage ccache && \ -source /etc/profile && \ -emerge -uDN @world && \ -emerge -n gentoolkit && \ -/usr/bin/emerge --depclean && \ -emerge @preserved-rebuild && \ -revdep-rebuild -- -qv --keep-going === modified file 'conf/make.conf' --- conf/make.conf 2012-03-01 22:00:47 +0000 +++ conf/make.conf 2012-01-18 17:27:32 +0000 @@ -2,7 +2,7 @@ MAKEOPTS="-j6 -l7" LINGUAS="en cs" -FEATURES="sandbox usersandbox userpriv userfetch -ccache config-protect-if-modified parallel-fetch parallel-install -preserve-libs unknown-features-warn -news" +FEATURES="sandbox usersandbox userpriv userfetch ccache" GENTOO_MIRRORS=" ftp://ftp.fi.muni.cz/pub/linux/gentoo/ === removed file 'conf/portage/package.mask' --- conf/portage/package.mask 2012-03-01 22:00:47 +0000 +++ conf/portage/package.mask 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -#=sys-libs/zlib-1.2.6 -#>=sys-libs/zlib-1.2.5-r2 === modified file 'scripts/generate_metalink.py' --- scripts/generate_metalink.py 2012-03-01 22:00:47 +0000 +++ scripts/generate_metalink.py 2012-01-20 04:29:24 +0000 @@ -38,7 +38,7 @@ print metalink_template.substitute( URI = uri, - FILENAME = os.path.basename(filename), + FILENAME = filename, SIZE = size, HASHES = ''.join( '%s'%(name, h.hexdigest()) === modified file 'scripts/tar_checksum' --- scripts/tar_checksum 2012-03-01 22:00:47 +0000 +++ scripts/tar_checksum 2012-01-20 04:29:24 +0000 @@ -30,6 +30,5 @@ /usr/bin/gpg --batch --clearsign <"${CHECK}" >"${CHECK}.signed" || die "gpg clearsign of $CHECK failed" run mv "${CHECK}.signed" "${CHECK}" -[[ -f ${METALINK}.sig ]] && rm ${METALINK}.sig run /usr/bin/gpg --batch --detach-sign "${METALINK}" === modified file 'stagebuilder.pl' --- stagebuilder.pl 2012-03-01 22:00:47 +0000 +++ stagebuilder.pl 2012-02-08 17:56:09 +0000 @@ -182,8 +182,8 @@ package_mask('=sys-apps/portage-9999') ]). gentoo_package(nopy3k, [ - package_mask('>=dev-lang/python-3') - %package_mask('net-zope/zope-fixers') + package_mask('>=dev-lang/python-3'), + package_mask('net-zope/zope-fixers') ]). gentoo_package(mc, [ package_use('app-misc/mc slang -ncurses'), @@ -244,29 +244,12 @@ ], [ vserver ]). -gentoo_package(picker_deps, [ - package_world('media-gfx/graphviz'), - package_world('dev-python/twisted'), - package_world('dev-python/twisted-web'), - package_world('dev-python/twisted-mail'), - package_world('dev-python/twisted-conch'), - package_world('dev-python/sqlalchemy'), - package_world('dev-python/docutils'), - package_world('dev-python/pyyaml') - ], [ - fontconfig, jpeg, png, postgres, serial, truetype, xml - ]). gentoo_package(amd64_optimize, [], [ mmx, sse, sse2, sse3, ssse3 ]). gentoo_package(Name, Echos, []) :- gentoo_package(Name, Echos). -gentoo_package(geode_optimize, [], [ - mmx, mmxext - ], [ - sse, sse2, sse3, ssse3 - ]). gentoo_package(nokit, [ package_mask('sys-auth/polkit'), package_mask('sys-auth/consolekit') @@ -458,16 +441,6 @@ {script_dir(Script)}, [run([Script +/+ build_gentoo_stage4, Dir])], create_stage(Name + '_stage4-p' + PortageVer, Dir). -gentoo_build_stage5(Name, Dir) --> - [comment('build stages')], - get_portage_timestamp(Dir, PortageVer), - [chroot(Dir, ['/root/prosys/update_stage3.sh'])], - create_stage(Name + '_stage3-p' + PortageVer, Dir), - {script_dir(Script)}, - [run([Script +/+ build_gentoo_stage4, Dir])], - create_stage(Name + '_stage4-p' + PortageVer, Dir), - [chroot(Dir, ['/root/prosys/build_stage5.sh'])], - create_stage(Name + '_stage5-p' + PortageVer, Dir). %%%%%%%%%%% % targets % @@ -489,69 +462,15 @@ target(i586_geodelx_testing, Dir) --> create_gentoo_builddir(i486, Dir), - {dir_make_conf(Dir, Make_conf)}, reset_make_conf(Dir, '-march=i586 -mtune=geode -O1 -pipe -fomit-frame-pointer', '${CFLAGS}', - 'i586-pc-linux-gnu'), - [echo_append('ACCEPT_KEYWORDS="~x86"', Make_conf)], - [echo_append('VIDEO_CARDS="dummy fbdev vesa geode"', Make_conf)], + 'i586-pc-linux-uclibc'), append_site_make_conf(Dir), - configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim, nokit, geode_optimize]), + configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim, nokit]), + [chroot(Dir, ['/usr/portage/scripts/bootstrap.sh'])], gentoo_build_stage4(i586_geodelx_testing, Dir). -target(i586_geodelx_uclibc, Dir) --> - create_gentoo_builddir(i486, Dir), - {dir_make_conf(Dir, Make_conf)}, - reset_make_conf(Dir, - '-march=i586 -mtune=geode -O1 -pipe -fomit-frame-pointer', - '${CFLAGS}', - 'i586-pc-linux-uclibc'), - [echo_append('ACCEPT_KEYWORDS="~x86"', Make_conf)], - [echo_append('UCLIBC_CPU="586"', Make_conf)], - append_site_make_conf(Dir), - configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim, nokit, geode_optimize]), - [comment('convert to uclibc'), - run([rm, Dir +/+ '/etc/make.profile']), - run([ln, '-s', '../usr/portage/profiles/uclibc/x86', Dir +/+ '/etc/make.profile']), - chroot(Dir, ['/root/prosys/rebuild_stage3_uclibc.sh']) - ], - gentoo_build_stage3(i586_geodelx_uclibc, Dir). - -target(amd64_stable, Dir) --> - create_gentoo_builddir(amd64, Dir), - %{dir_make_conf(Dir, Make_conf)}, - reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}' - ,'amd64-pc-linux-gnu'), - %[echo_append('ACCEPT_KEYWORDS="~amd64"', Make_conf)], - append_site_make_conf(Dir), - configure_gentoo_packages(Dir ,[ - portage22, nopy3k, vim, mc, nokit, - portage_utilities, - base_utilities, base_system, base_network, - network_utilities, filesystem_utilities - ]), - gentoo_build_stage5(amd64_stable, Dir). - -target(amd64_mskp, Dir) --> - create_gentoo_builddir(amd64, Dir), - %{dir_make_conf(Dir, Make_conf)}, - reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}' - ,'amd64-pc-linux-gnu'), - %[echo_append('ACCEPT_KEYWORDS="~amd64"', Make_conf)], - append_site_make_conf(Dir), - configure_gentoo_packages(Dir ,[ - portage22, nopy3k, nokit, - portage_utilities, - base_utilities, base_system, base_network, - network_utilities, filesystem_utilities, - picker_deps - ]), - [comment('remove python3') - ,chroot(Dir, ['/root/prosys/rm_py3k.sh']) - ], - gentoo_build_stage5(amd64_mskp, Dir). - target(amd64_testing, Dir) --> create_gentoo_builddir(amd64, Dir), {dir_make_conf(Dir, Make_conf)},