=== removed file 'conf/chroot.sh-x86' --- conf/chroot.sh-x86 2012-01-20 04:29:24 +0000 +++ conf/chroot.sh-x86 1970-01-01 00:00:00 +0000 @@ -1,78 +0,0 @@ -#!/bin/bash -SCRIPT=$(readlink -f $0) -DIR="`dirname "$SCRIPT"`" -EXE="${1:-$SHELL}" -PS4='+\t \s> ' - -cd "$DIR" - -declare -A NEW_ENV -NEW_ENV[HOST]="`basename $DIR`" -NEW_ENV[TERM]="${TERM%-256color}" -NEW_ENV[HOME]=/root/ -NEW_ENV[PATH]="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" - -do_chroot() { - local -a environ - for key in "${!NEW_ENV[@]}" - do - environ+=( "${key}=${NEW_ENV[$key]}" ) - done - env -i - "${environ[@]}" linux32 chroot . "$@" - RET=$? - echo "command $* returned $RET" -} - -UMOUNT="" - -trymount() { - for DST in "$@"; do true; done - if mount | grep -q "$DIR/$DST" - then - echo "$DST already mounted" - else - echo "mounting $DST" - mount "$@" - UMOUNT="$DST $UMOUNT" - fi -} - -#set -x - -#trymount --bind {/,}dev -mkdir -v -p dev/{pts,shm} -trymount -t devpts devpts dev/pts -trymount -t tmpfs tmpfs dev/shm - -trymount -t proc none proc - -[[ -d usr/portage ]] && \ -trymount --bind {/,}usr/portage -[[ -d var/portage/distfiles ]] && \ -trymount --bind {/,}var/portage/distfiles -[[ -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 tmpfs tmp - -cp -v /etc/resolv.conf etc/ -cat proc/mounts >etc/mtab - - -#if [ -n "$DISPLAY" ] && [ -x ./usr/bin/xauth ] -#then -# echo "copying over X Authentication for $DISPLAY" -# xauth extract - $DISPLAY | do_chroot /bin/bash -x -c '/usr/bin/xauth merge -' -# NEW_ENV[DISPLAY]="127.0.0.1${DISPLAY}" -#fi - -do_chroot "$EXE" - -for M in $UMOUNT -do - echo "unmouting $M" - umount "$M" -done -set -x -exit $RET === removed directory 'conf/portage' === removed file 'conf/portage/bashrc' --- conf/portage/bashrc 2012-01-20 04:29:24 +0000 +++ conf/portage/bashrc 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -export CCACHE_COMPILERCHECK=content === removed file 'scripts/generate_metalink.py' --- scripts/generate_metalink.py 2012-01-20 04:29:24 +0000 +++ scripts/generate_metalink.py 1970-01-01 00:00:00 +0000 @@ -1,57 +0,0 @@ -#!/usr/bin/env python -# vim: tw=75 sts=4 ts=4 noet fileencoding=utf-8 -import sys -import string -import os.path -import hashlib - -hashnames = ['md5', 'sha1', 'sha256'] -block = 1024 - -metalink_template = string.Template( -""" - - - - $SIZE - $HASHES - - $URI - - - -""") - -def main(filename, uri): - f = open(filename, 'rb') - hashes = [ hashlib.new(name) for name in hashnames ] - #size = 0 - - data = f.read(block) - while data: - #size += len(data) - for h in hashes: h.update(data) - data = f.read(block) - - size = f.tell() - f.close() - - print metalink_template.substitute( - URI = uri, - FILENAME = filename, - SIZE = size, - HASHES = ''.join( - '%s'%(name, h.hexdigest()) - for name, h - in zip(hashnames, hashes) - ) - ) - - -if __name__ == '__main__': - if len(sys.argv) != 3: - print "usage: %s "%os.path.basename(sys.argv[0]) - sys.exit(1) - else: - main(*sys.argv[1:]) - === removed file 'scripts/tar_checksum' --- scripts/tar_checksum 2012-01-20 04:29:24 +0000 +++ scripts/tar_checksum 1970-01-01 00:00:00 +0000 @@ -1,34 +0,0 @@ -#!/bin/zsh - -# usage: $0 filename other_tar_options - -FILE=$1 -shift -CHECK=${FILE}.DIGESTS -METALINK=${FILE}.metalink - -umask 022 - -die() { - echo ERROR: $* - exit 1 -} -run() { - "$@" <&- || die "$@" -} - -set -x - -tar -cf $FILE "$@" || die tar -${0:h}/generate_metalink.py $FILE http://webprojekty.cz/stages/${FILE:t} >$METALINK || die metalink generation failed -( - cd ${FILE:h} - md5sum ${FILE:t} - sha1sum ${FILE:t} - sha512sum ${FILE:t} -) >"${CHECK}" || die "failed to generate checksums" - -/usr/bin/gpg --batch --clearsign <"${CHECK}" >"${CHECK}.signed" || die "gpg clearsign of $CHECK failed" -run mv "${CHECK}.signed" "${CHECK}" -run /usr/bin/gpg --batch --detach-sign "${METALINK}" - === modified file 'stagebuilder.pl' --- stagebuilder.pl 2012-01-20 04:29:24 +0000 +++ stagebuilder.pl 2012-01-18 17:27:32 +0000 @@ -126,13 +126,12 @@ [run([tar, '-xpf', Tarball, '-C', Dir])]. create_tarball(Tarball, Dir, AddOpts) --> - {script_dir(ScriptDir)}, - [run([ScriptDir +/+ tar_checksum, Tarball|Opts])], - {append(AddOpts, ['-pC', Dir, '.'], Opts)}. + [run([tar|Opts])], + {append(AddOpts, ['-cpf', Tarball, '-C', Dir, '.'], Opts)}. create_stage(Name, Dir) --> {stages_dir(Stages)}, - create_tarball(Stages +/+ Name + '.tar.bz2', Dir, ['--use-compress-prog=pbzip2']). + create_tarball(Stages +/+ Name + '.tar.xz', Dir, ['--xz']). %http_glob(variable(uri), Uri) --> % {script_dir(ScriptDir)}, @@ -222,8 +221,7 @@ gentoo_package(base_x11, [ package_world('ccx-meta/base-x11'), package_use('dev-libs/libxml2 python'), - package_use('x11-libs/libdrm libkms'), - package_use('net-print/cups -filters') % break circular dependency with foomatic + package_use('x11-libs/libdrm libkms') ], [ '256-color', 'X', apng, cairo, exif, gif, gstreamer, gtk, imlib, jpeg, opengl, png, sdl, 'sdl-image', tcl, tk, tiff, truetype, webkit, xcb, xpm @@ -421,9 +419,6 @@ run([rsync, '-a', Conf +/+ 'gentoo_scripts/' , Dir +/+ 'root/prosys/' ]), - run([rsync, '-a', Conf +/+ 'portage/' - , Dir +/+ 'etc/portage/' - ]), comment('configure local settings') ], set_timezone(Dir, 'Europe/Prague'), @@ -491,38 +486,6 @@ ]), gentoo_build_stage4(amd64_testing_x11, Dir). -target(atom_testing_eeepc, Dir) --> - create_gentoo_builddir(i686, Dir), - {dir_make_conf(Dir, Make_conf)}, - reset_make_conf(Dir, '-Os -march=prescott -pipe -fomit-frame-pointer' - , '${CFLAGS}', 'i686-pc-linux-gnu'), - [echo_append('ACCEPT_KEYWORDS="~x86"', 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, - base_x11, base_media - ]), - gentoo_build_stage4(atom_testing_eeepc, Dir). - -target(k8_testing_x11, Dir) --> - create_gentoo_builddir(i686, Dir), - {dir_make_conf(Dir, Make_conf)}, - reset_make_conf(Dir, '-O2 -march=i686 -mcpu=k8 -pipe -fomit-frame-pointer' - , '${CFLAGS}', 'i686-pc-linux-gnu'), - [echo_append('ACCEPT_KEYWORDS="~x86"', 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, - base_x11, base_media - ]), - gentoo_build_stage4(k8_testing_x11, Dir). - target(amd64_hardened_vshost, Dir) --> create_gentoo_builddir(amd64_hardened, Dir), {dir_make_conf(Dir, Make_conf)},