=== removed directory 'conf' === removed file 'conf/make.conf' --- conf/make.conf 2011-10-23 04:06:19 +0000 +++ conf/make.conf 1970-01-01 00:00:00 +0000 @@ -1,12 +0,0 @@ -MAKEOPTS="-j4" -LINGUAS="en cs" - -FEATURES="sandbox usersandbox userpriv userfetch" - -GENTOO_MIRRORS="${GENTOO_MIRRORS} http://ftp.sh.cvut.cz/gentoo" - -PORT_LOGDIR="/var/log/portage" -PKGDIR="/var/portage/packages" -DISTDIR="/var/portage/distfiles" - -PORTDIR_OVERLAY="/var/portage/ccx-autobuild" === removed directory 'overlay' === removed directory 'overlay/ccx-meta' === removed directory 'overlay/ccx-meta/base-network' === removed file 'overlay/ccx-meta/base-network/Manifest' --- overlay/ccx-meta/base-network/Manifest 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-network/Manifest 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -EBUILD base-network-1.ebuild 327 RMD160 c80dc33847e96fc60ca530023fe96562af832952 SHA1 1ae8169695bc4d929f45ab386ca48b0f9f165877 SHA256 89042ba104c87044d93b443927fdfcd144a6711340633dc7933c0995764aec2d === removed file 'overlay/ccx-meta/base-network/base-network-1.ebuild' --- overlay/ccx-meta/base-network/base-network-1.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-network/base-network-1.ebuild 1970-01-01 00:00:00 +0000 @@ -1,24 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND=" -net-misc/ntp -net-misc/dhcpcd -net-firewall/iptables -net-fs/nfs-utils -sys-apps/iproute2 -" - === removed directory 'overlay/ccx-meta/base-system' === removed file 'overlay/ccx-meta/base-system/Manifest' --- overlay/ccx-meta/base-system/Manifest 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-system/Manifest 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -EBUILD base-system-1.ebuild 415 RMD160 19cc5ea5d8c3886651f75e3afeffb77defb2f624 SHA1 efb57c79d966f56882701569edf3c674c3b4dda6 SHA256 845d4de41d2f7372b401f6d0376dadb25ba2e8bcd1aa32eb3e8ec184fdbfca3c === removed file 'overlay/ccx-meta/base-system/base-system-1.ebuild' --- overlay/ccx-meta/base-system/base-system-1.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-system/base-system-1.ebuild 1970-01-01 00:00:00 +0000 @@ -1,25 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND="app-admin/logrotate -app-admin/syslog-ng -sys-process/vixie-cron" - -pkg_postinst(){ - rc-update add vixie-cron default - rc-update add syslog-ng default - rc-update add sshd default -} === removed directory 'overlay/ccx-meta/base-utilities' === removed file 'overlay/ccx-meta/base-utilities/Manifest' --- overlay/ccx-meta/base-utilities/Manifest 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-utilities/Manifest 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -EBUILD base-utilities-1.ebuild 366 RMD160 8010ca927bd5ba1d3fd620aca33ecf75c68bf9ff SHA1 eed0bb38e452ab186e5e789c005c36a64adb83d0 SHA256 56fe40845f96fad00c83d2a137a2200c809705d89eb6e75c5bea279c72069d25 -EBUILD base-utilities-2.ebuild 535 RMD160 6be7474a46aee6f8c40910b4c4ea6f20ce35f2d3 SHA1 6e55526e91863e8230f9ac7a57fad7d13e99637a SHA256 c8a87ae8694c20ab6924a56cfb32eb7e37cd5c448d096f35aab78332fe4105a3 === removed file 'overlay/ccx-meta/base-utilities/base-utilities-1.ebuild' --- overlay/ccx-meta/base-utilities/base-utilities-1.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-utilities/base-utilities-1.ebuild 1970-01-01 00:00:00 +0000 @@ -1,25 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND="app-editors/vim -app-misc/tmux -app-shells/zsh -app-shells/zsh-completion -sys-fs/ncdu -dev-vcs/bzr -sys-process/htop -sys-apps/dstat" - === removed file 'overlay/ccx-meta/base-utilities/base-utilities-2.ebuild' --- overlay/ccx-meta/base-utilities/base-utilities-2.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-utilities/base-utilities-2.ebuild 1970-01-01 00:00:00 +0000 @@ -1,33 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND="app-editors/vim -app-misc/tmux -app-shells/zsh -app-shells/zsh-completion -sys-fs/ncdu -dev-vcs/bzr -sys-process/htop -sys-apps/dstat" - -src_install() { - cd $FILESDIR - insinto /etc/skel - find skel-${PV} -type f | while read FILE - do - doins $F || die "could not install ${PWD}/${F} into /etc/skel" - done -} === removed directory 'overlay/ccx-meta/base-utilities/files' === removed directory 'overlay/ccx-meta/base-utilities/files/skel-2' === removed file 'overlay/ccx-meta/base-utilities/files/skel-2/.tmux.conf' --- overlay/ccx-meta/base-utilities/files/skel-2/.tmux.conf 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-utilities/files/skel-2/.tmux.conf 1970-01-01 00:00:00 +0000 @@ -1,79 +0,0 @@ -# use 256color terminal -set -g default-terminal screen-256color - -# split windows like vim -# vim's definition of a horizontal/vertical split is reversed from tmux's -bind s split-window -v -bind v split-window -h - -# move around panes with j and k, a bit like vim -# as of tmux 1.1, there is no way to move based on pane position (ie, no way to -# move the pane to the right) -bind -r j select-pane -D -bind -r k select-pane -U -bind -r h select-pane -L -bind -r l select-pane -R - -# resize panes like vim -# feel free to change the "1" to however many lines you want to resize by, only -# one at a time can be slow -bind -r < resize-pane -L 1 -bind -r > resize-pane -R 1 -bind -r - resize-pane -D 1 -bind -r + resize-pane -U 1 - -# create new window and show statusbar -# useful if you spawn session without one -bind c new-window \; set status on \; bind c new-window - -# bind : to command-prompt like vim -# this is the default in tmux already -bind : command-prompt -# I can't bind C-: so use C-l for now -bind -n "C-l" command-prompt - -# to reload config file -bind R source ~/.tmux.conf - -bind K confirm-before kill-pane -bind L choose-buffer "copy-buffer -a %%" -bind P choose-buffer - -bind b set status off -bind B set status on - -bind m setw monitor-activity off -bind M setw monitor-activity on - -# X11 clipboard integration -bind x run "tmux save-buffer - | xclip -i" -bind X run "xclip -o | tmux load-buffer -" - -bind e capture-pane \; neww "tmux save-buffer - | vim -" - -# vi-style controls for copy mode -setw -g mode-keys vi -set -g status-keys vi - -bind-key -t vi-copy V rectangle-toggle # enter 'visual mode' -bind-key -t vi-copy v begin-selection # enter 'visual mode' -bind-key -t vi-copy y copy-selection # 'yank' - -# format strings for window title & statusbar -set -g set-titles on -set -g set-titles-string "#W - tmux::#S:#(whoami)@#H" - -#set -g status-justify centre -set -g status-bg black -set -g status-fg white -set -g status-left-fg green -set -g status-left-length 30 -set -g status-left "[#(whoami)@#H:#S]" -set -g status-right-fg yellow -set -g status-right "%Y-%m-%d %H:%M" - -setw -g window-status-alert-attr default -setw -g window-status-alert-fg yellow -setw -g window-status-fg cyan -setw -g window-status-format "(#I#F #10W)" -setw -g window-status-current-format "#[fg=red][#[fg=white]#I#F #W#[fg=red]]" === removed file 'overlay/ccx-meta/base-utilities/files/skel-2/.zshrc' --- overlay/ccx-meta/base-utilities/files/skel-2/.zshrc 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/base-utilities/files/skel-2/.zshrc 1970-01-01 00:00:00 +0000 @@ -1,211 +0,0 @@ -# Load system settings -source /etc/zsh/zprofile - -######################################### -# set $fpath before we autoload scripts # -######################################### - -fpath=( ~/.zsh/functions $fpath ) - -if [ -d ~/.zen ] -then - fpath=( - $fpath - /home/ccx/.zen/zsh/scripts - /home/ccx/.zen/zsh/zle ) - autoload -U zen - #zen update -fi - -########################## -# autoload for functions # -########################## - -autoload -U compinit promptinit -compinit - -autoload -Uz vcs_info - -autoload -U edit-command-line -zle -N edit-command-line - -############### -# keybindings # -############### - -# insert -bindkey "^[[2~" overwrite-mode -# delete -bindkey "^[[3~" delete-char -bindkey "^[3~" delete-char - -# home -bindkey "^[[7~" beginning-of-line -bindkey "^[[1~" beginning-of-line -bindkey "^[[H" beginning-of-line -bindkey "^[OH" beginning-of-line -# end -bindkey "^[[8~" end-of-line -bindkey "^[[4~" end-of-line -bindkey "^[[F" end-of-line -bindkey "^[OF" end-of-line - -# page up -bindkey "^[[5~" history-beginning-search-backward -# page down -bindkey "^[[6~" history-beginning-search-forward - -# ctrl-z -bindkey '^z' edit-command-line - -# ctrl-e -bindkey ^E menu-expand-or-complete - -# tab -bindkey ^I complete-word - -# ctrl+arrow -bindkey "^[OC" forward-word -bindkey "^[OD" backward-word - -################## -# shell features # -################## - -unsetopt equals -setopt interactivecomments - -HISTSIZE=100000 -SAVEHIST=100000 -HISTFILE=~/.zsh-history -setopt INC_APPEND_HISTORY - -######################### -# configuration helpers # -######################### - -in_path() { - [[ -x ${commands[${1}]} ]] -} - -########### -# aliases # -########### - -alias ls="ls --color" -alias ll="ls -lh --color --time-style=long-iso" -alias ns="netstat -ltup" -#alias ns="sudo netstat -atp" -#alias man=w3mman - -if in_path vim -then - alias vi=vim - export EDITOR=${commands[vim]} -fi - -mkcd(){ - mkdir $* && cd ${argv[-1]} -} - -ssh() { - TERM=${TERM%-256color} /usr/bin/ssh $@ -} - -############## -# the prompt # -############## - -promptinit; prompt gentoo yellow -PS1="\${vcs_info_msg_0_}%(?..%B%F{yellow}<%?>)%(1j.%B%F{cyan}{%j}.)$PS1" -setopt PROMPT_SUBST - -if [ "$TERM" = "screen" ] -then - #PS1=$'%{\ek\e\\%}'"${PS1}" - #PS1=$'%{\ek%~\e\\%}'"${PS1}" - PS1=$'%{\ek%n@%m:%~\e\\%}'"${PS1}" -fi - -PS4='+%B%* %F{cyan}%N%f:%F{yellow}%i%f>%b ' - -zstyle ':vcs_info:*' enable git svn hg bzr - -# bzr specific - -#zstyle ':vcs_info:bzr:*' use-simple true -zstyle ':vcs_info:bzr:*' check-for-changes true -zstyle ':vcs_info:bzr:*:'${HOME:t} formats '%F{red}%m%f' -zstyle ':vcs_info:bzr:*' formats '%F{green}%s: %b %F{cyan}%m%f -' -zstyle ':vcs_info:bzr:*' branchformat '%F{yellow}%b %F{green}rev:%r' - -# git / hg - -zstyle ':vcs_info:(hg|git):*' formats '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{5}]%f -' -zstyle ':vcs_info:(hg|git):*' actionformats '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f -' - -precmd(){ - vcs_info -} - -############################## -# online syntax highlighting # -############################## - -if [[ -f ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]]; then - ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor) #pattern #cursor - source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - #ZSH_HIGHLIGHT_STYLES[cursor]='bg=black,fg=white' - ZSH_HIGHLIGHT_STYLES[cursor]='none' - ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]='bg=blue' - - ZSH_HIGHLIGHT_STYLES[bracket-level-1]='fg=cyan,bold' - ZSH_HIGHLIGHT_STYLES[bracket-level-2]='fg=red,bold' - ZSH_HIGHLIGHT_STYLES[bracket-level-3]='fg=yellow,bold' - ZSH_HIGHLIGHT_STYLES[bracket-level-4]='fg=magenta,bold' - ZSH_HIGHLIGHT_STYLES[bracket-level-5]='fg=green,bold' - - ZSH_HIGHLIGHT_STYLES[assign]='fg=cyan' - - ZSH_HIGHLIGHT_STYLES[builtin]='fg=yellow' - ZSH_HIGHLIGHT_STYLES[precommand]='fg=yellow' - - ZSH_HIGHLIGHT_STYLES[command]='bold' - ZSH_HIGHLIGHT_STYLES[hashed-command]='bold' - - ZSH_HIGHLIGHT_STYLES[globbing]='fg=cyan' - ZSH_HIGHLIGHT_STYLES[path]='bold' - - ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=magenta,bold' - ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=magenta,bold' -fi - -################### -# the environment # -################### - -if [ -e "${HOME}/.gtkrc-2.0" ]; then - export GTK2_RC_FILES="${HOME}/.gtkrc-2.0" -fi - -if [ -e "${HOME}/.dircolors" ]; then - eval $(dircolors -b "${HOME}/.dircolors") -elif [ -e /etc/DIR_COLORS ] -then - eval $(dircolors -b /etc/DIR_COLORS) -fi - -zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} - -# Run keychain if available - -if in_path keychain -then - keychain -Q -q - source ~/.keychain/*-sh - source ~/.keychain/*-sh-gpg -fi - === removed directory 'overlay/ccx-meta/filesystem-utilities' === removed file 'overlay/ccx-meta/filesystem-utilities/Manifest' --- overlay/ccx-meta/filesystem-utilities/Manifest 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/filesystem-utilities/Manifest 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -EBUILD filesystem-utilities-1.ebuild 424 RMD160 d023cd70fd75ca066c9f2779ee5856e72ca1fdbd SHA1 01c8bcedc81e44ea22810d3c6fad3e12c6ea1cad SHA256 3269e858d66d194e1bc4291eedbe3189039eafe7bdf9a3fcb500b37b1f0b89f4 === removed file 'overlay/ccx-meta/filesystem-utilities/filesystem-utilities-1.ebuild' --- overlay/ccx-meta/filesystem-utilities/filesystem-utilities-1.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/filesystem-utilities/filesystem-utilities-1.ebuild 1970-01-01 00:00:00 +0000 @@ -1,28 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND="sys-fs/dmraid -sys-fs/dosfstools -sys-fs/lvm2 -sys-fs/mdadm -sys-fs/reiserfsprogs -sys-fs/squashfs-tools -sys-fs/xfsdump -sys-fs/sshfs-fuse -sys-fs/xfsprogs -sys-fs/btrfs-progs -sys-block/parted" - === removed directory 'overlay/ccx-meta/network-utilities' === removed file 'overlay/ccx-meta/network-utilities/Manifest' --- overlay/ccx-meta/network-utilities/Manifest 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/network-utilities/Manifest 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -EBUILD network-utilities-1.ebuild 382 RMD160 22d09ca46c543e21fce297ed7a425f64b6f1638d SHA1 c2e930497e9827bf521cb8c210e0a02408a66e3c SHA256 679ae587ba0a8aa8a2a43569ef35bc8b15f921b410a8cf064567941e6bc67cf6 === removed file 'overlay/ccx-meta/network-utilities/network-utilities-1.ebuild' --- overlay/ccx-meta/network-utilities/network-utilities-1.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/network-utilities/network-utilities-1.ebuild 1970-01-01 00:00:00 +0000 @@ -1,24 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND="net-analyzer/netcat -net-analyzer/netselect -net-analyzer/nmap -net-analyzer/tcpdump -net-analyzer/tcptraceroute -net-dns/bind-tools -net-misc/socat" - === removed directory 'overlay/ccx-meta/portage-utilities' === removed file 'overlay/ccx-meta/portage-utilities/Manifest' --- overlay/ccx-meta/portage-utilities/Manifest 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/portage-utilities/Manifest 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -EBUILD portage-utilities-1.ebuild 295 RMD160 6e60a405ec9b5d71c1227fa9dc21aaa90602457c SHA1 edfe061250883cdf1f6e478038ac6b838c9ae0e3 SHA256 5da5cd7b68c17212f1a1408163d3b7d778e3d91371fc5a007f973eea3d4f6b63 === removed file 'overlay/ccx-meta/portage-utilities/portage-utilities-1.ebuild' --- overlay/ccx-meta/portage-utilities/portage-utilities-1.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/ccx-meta/portage-utilities/portage-utilities-1.ebuild 1970-01-01 00:00:00 +0000 @@ -1,21 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND="app-portage/eix -app-portage/epm -app-portage/gentoolkit -" - === removed directory 'overlay/profiles' === removed file 'overlay/profiles/categories' --- overlay/profiles/categories 2011-10-23 04:06:19 +0000 +++ overlay/profiles/categories 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -ccx-meta -ccx-scripts === removed file 'overlay/profiles/name' --- overlay/profiles/name 2011-10-23 04:06:19 +0000 +++ overlay/profiles/name 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -ccx-autobuild === removed directory 'overlay/sys-cluster' === removed directory 'overlay/sys-cluster/vserver-init' === removed file 'overlay/sys-cluster/vserver-init/Manifest' --- overlay/sys-cluster/vserver-init/Manifest 2011-10-23 04:06:19 +0000 +++ overlay/sys-cluster/vserver-init/Manifest 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -AUX 1-init-vserver.sh 1013 RMD160 4b84b22a48f621df44cdf0f311282d046b39094c SHA1 dd6d75fff5574068caece94ac9b167ca84d0ea31 SHA256 13d90a07cb23cc846bdf25be51246a325bc6b6ffa98e026cc665d6f13fc5f103 -EBUILD vserver-init-1.ebuild 426 RMD160 eda510a0013ca234dcbd935c44ec9af5ab62d416 SHA1 10383d0e61d7db57c7bcb7da6f6d848edd7084a1 SHA256 6c5d6306d32c75d528e3f7d7cbf6099f7fea3d7c542bed2ea2e5f46069fc664d === removed directory 'overlay/sys-cluster/vserver-init/files' === removed file 'overlay/sys-cluster/vserver-init/files/1-init-vserver.sh' --- overlay/sys-cluster/vserver-init/files/1-init-vserver.sh 2011-10-23 04:06:19 +0000 +++ overlay/sys-cluster/vserver-init/files/1-init-vserver.sh 1970-01-01 00:00:00 +0000 @@ -1,31 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2006 Benedikt Boehm -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# -# BIG FAT WARNING: -# -# Do not remove this file if you are using gentoo init style! -# Your vserver will not boot anymore! -# -# You have been warned... - -# Force TERM=linux for baselayout-2 - -RUNLEVEL=1 /sbin/rc sysinit || exit 1 -/sbin/rc boot || exit 1 -/sbin/rc ${1:-default} -exit 0 === removed file 'overlay/sys-cluster/vserver-init/vserver-init-1.ebuild' --- overlay/sys-cluster/vserver-init/vserver-init-1.ebuild 2011-10-23 04:06:19 +0000 +++ overlay/sys-cluster/vserver-init/vserver-init-1.ebuild 1970-01-01 00:00:00 +0000 @@ -1,22 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="Script to replace init on vserver guests using Gentoo init style" -HOMEPAGE="" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_install(){ - doexe /lib/rcscripts/sh/ - newexe ${FILESDIR}/${PV}-init-vserver.sh init-vserver.sh || die -} === modified file 'stagebuilder.prolog' --- stagebuilder.prolog 2011-10-23 04:06:19 +0000 +++ stagebuilder.prolog 2011-10-22 22:34:58 +0000 @@ -1,14 +1,10 @@ -% vim: ft=prolog tw=80 ts=4 sts=4 noet + +site_conf_dir('/etc/prosys'). gentoo_mirror('ftp://ftp.sh.cvut.cz/MIRRORS/gentoo'). :- op(400, yfx, +/+). -work_dir('/home/ccx/bzr/prosys'). -site_conf_dir(Wrk +/+ conf) :- work_dir(Wrk). -downloads_dir(Wrk +/+ downloads) :- work_dir(Wrk). -stages_dir(Wrk +/+ stages) :- work_dir(Wrk). - concat([], []). concat([H|T], String) :- (atom(H) -> name(H, HS); HS = H), @@ -36,6 +32,18 @@ rstrip(S, T, Out), (length(Out, 0), member(H, S) -> O = []; O = [H|Out]). +path_join([X], X). +path_join([A, B|R], Result) :- + (atom(A) -> name(A, AS); AS = A), + (atom(B) -> name(B, BS); BS = B), + rstrip("/", AS, AP), + lstrip("/", BS, BP), + concat([AP, "/", BP], Merged), + path_join([Merged|R], Result). +path_joinn(L, N) :- path_join(L, S), name(N, S). + +site_conf_file(Name, Dir +/+ Name) :- site_conf_dir(Dir). + escape_backslashes([], []). escape_backslashes([UC|UR], E) :- escape_backslashes(UR, ER), ( @@ -91,57 +99,8 @@ escape_n(X, N) :- escape(X, S), name(N, S). -list_escape([], []). -list_escape([U|UR], [E|ER]) :- escape(U, E), list_escape(UR, ER). - -cmd_tokens(run(L), E) :- list_escape(L, E). - -cmd_tokens(run_append(L, F), T) :- - list_escape(L, E), - escape(F, FE), - append(E, [">>", FE], T). - -cmd_tokens(run_replace(L, F), T) :- - list_escape(L, E), - escape(F, FE), - append(E, [">", FE], T). - -cmd_tokens(run_outvar(L, V), T) :- - list_escape(L, E), - concat([V, "=$("], Pre), - concat([[Pre], E, [")"]], T). - -cmd_tokens(echo_append(String, File), E) :- - cmd_tokens(run_append([echo, String], File), E). -cmd_tokens(echo_replace(String, File), E) :- - cmd_tokens(run_replace([echo, String], File), E). -cmd_tokens(chroot(Dir, Args), E) :- - cmd_tokens(run([Dir +/+ 'chroot.sh'|Args]), E). - -format_cmds([], []). -format_cmds([Cmd|R], [S|SR]) :- - cmd_tokens(Cmd, Tokens), - strjoin(" ", Tokens, S), - format_cmds(R, SR). - -print_cmds([]). -print_cmds(Commands) :- - format_cmds(Commands, Lines), - strjoin("\n", Lines, S), - name(N,S), - write(N). - -site_conf_file(Name, Dir +/+ Name) :- site_conf_dir(Dir). - unpack_tarball(Tarball, Dir, [run([tar, '-xpf', Tarball, '-C', Dir])]). -create_tarball(Tarball, Dir, AddOpts, [run([tar | Opts])]) :- - append(AddOpts, ['-cpf', Tarball, '-C', Dir, '.'], Opts). - -create_stage(Name, Dir, Commands) :- - stages_dir(Stages), - create_tarball(Stages +/+ Name + '.tar.xz', Dir, ['--xz'], Commands). - http_glob(Uri, [run_outvar([http_glob, Uri], uri)], variable(uri)). digest_download(Uri, @@ -179,9 +138,6 @@ package_use('app-misc/mc slang -ncurses'), package_world('app-misc/mc')]). -gentoo_package(portage_utilities, [ - package_world('ccx-meta/portage-utilities')]). - gentoo_package(vim, [package_world('app-editors/vim')], [ 'vim', 'vim-pager', 'vim-syntax']). @@ -190,26 +146,6 @@ package_world('app-shells/zsh-completion') ],['zsh-completion']). -gentoo_package(base_utilities, [ - package_world('ccx-meta/base-utilities') - ],['zsh-completion', unicode]). - -gentoo_package(base_system, [ - package_world('ccx-meta/base-system') - ],[caps, xattrs, acl]). - -gentoo_package(base_network, [ - package_world('ccx-meta/base-network') - ],[ipv6]). - -gentoo_package(filesystem_utilities, [ - package_world('ccx-meta/filesystem-utilities') - ],['device-mapper', xfs]). - -gentoo_package(network_utilities, [ - package_world('ccx-meta/network-utilities') - ],[ssl,ipv6]). - gentoo_package(Name, Echos, []) :- gentoo_package(Name, Echos). gentoo_package(Name, Echos, UseE, []) :- gentoo_package(Name, Echos, UseE). @@ -276,10 +212,7 @@ download_gentoo_stage(Name, C1, Tarball), unpack_tarball(Tarball, Dir, C2), create_chroot_script(Dir, ArchName, C3), - work_dir(Wrk), - concat([C1, C2, C3, [ - run([rsync, '-a', Wrk +/+ 'overlay/', Dir +/+ 'var/portage/ccx-autobuild']) - ]], Commands). + concat([C1, C2, C3], Commands). target(i686_hardened_stage3, Dir, Commands) :- create_gentoo_builddir(i686_hardened, Dir, C1), @@ -291,20 +224,44 @@ append_site_make_conf(Dir, C3), configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim], C4), C5 = [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])], - create_stage(i686_hardened_stage3, Dir, C6), - concat([C1, C2, C3, C4, C5, C6], Commands). - -target(amd64_hardened_vshost, Dir, Commands) :- - create_gentoo_builddir(i686_hardened, Dir, C1), - reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}', 'amd64-pc-linux-gnu', C2), - C3 = [echo_append('ACCEPT_KEYWORDS="~amd64"')], - append_site_make_conf(Dir, C4), - configure_gentoo_packages(Dir, [ - portage22, nopy3k - ], C5), - C6 = [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])], - create_stage(amd64_hardened_vshost_stage3, Dir, C7), - C8 = [chroot(Dir, ['emerge -uDN $( cat /root/prosys/world )'])], - create_stage(amd64_hardened_vshost_stage4, Dir, C9), - concat([C1, C2, C3, C4, C5, C6, C7, C8, C9], Commands). - + concat([C1, C2, C3, C4, C5], Commands). + +list_escape([], []). +list_escape([U|UR], [E|ER]) :- escape(U, E), list_escape(UR, ER). + +cmd_tokens(run(L), E) :- list_escape(L, E). + +cmd_tokens(run_append(L, F), T) :- + list_escape(L, E), + escape(F, FE), + append(E, [">>", FE], T). + +cmd_tokens(run_replace(L, F), T) :- + list_escape(L, E), + escape(F, FE), + append(E, [">", FE], T). + +cmd_tokens(run_outvar(L, V), T) :- + list_escape(L, E), + concat([V, "=$("], Pre), + concat([[Pre], E, [")"]], T). + +cmd_tokens(echo_append(String, File), E) :- + cmd_tokens(run_append([echo, String], File), E). +cmd_tokens(echo_replace(String, File), E) :- + cmd_tokens(run_replace([echo, String], File), E). +cmd_tokens(chroot(Dir, Args), E) :- + cmd_tokens(run([Dir +/+ 'chroot.sh'|Args]), E). + +format_cmds([], []). +format_cmds([Cmd|R], [S|SR]) :- + cmd_tokens(Cmd, Tokens), + strjoin(" ", Tokens, S), + format_cmds(R, SR). + +print_cmds([]). +print_cmds(Commands) :- + format_cmds(Commands, Lines), + strjoin("\n", Lines, S), + name(N,S), + write(N).