=== modified file '.bzrignore' --- .bzrignore 2012-03-26 00:01:55 +0000 +++ .bzrignore 2012-03-01 22:00:47 +0000 @@ -2,4 +2,3 @@ downloads stages build -Session.vim === modified file 'overlay/ccx-meta/net-clients/Manifest' --- overlay/ccx-meta/net-clients/Manifest 2012-03-26 00:01:55 +0000 +++ overlay/ccx-meta/net-clients/Manifest 2012-03-23 01:02:33 +0000 @@ -1,2 +1,1 @@ EBUILD net-clients-1.ebuild 633 RMD160 647cd2373bbf8a74ec3239294bd1d46fdb42c0c8 SHA1 195f9c9fffa74246a480ae61c983f63465f074a8 SHA256 d33f63e527b0a2f1f02e84e376b314483e48eb88d73f8f96421831ac4f757723 -EBUILD net-clients-2.ebuild 634 RMD160 97e3e30a283c5525c92523e2d84c61e93dbe8bc6 SHA1 9d3f66feb250c2dee743a52ada2ac74764a6b02f SHA256 760aade19e65373a12d2f9b0a4d7351f97a9390d4e39bbb6fcdfd136c39b237e === removed file 'overlay/ccx-meta/net-clients/net-clients-2.ebuild' --- overlay/ccx-meta/net-clients/net-clients-2.ebuild 2012-03-26 00:01:55 +0000 +++ overlay/ccx-meta/net-clients/net-clients-2.ebuild 1970-01-01 00:00:00 +0000 @@ -1,38 +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="X" - -DEPEND="" -RDEPEND=" -www-client/w3m -mail-client/mutt -net-im/mcabber -net-irc/weechat -net-news/newsbeuter -net-nntp/slrn -net-misc/aria2 -net-misc/corkscrew -www-client/httrack -www-client/surfraw -X? ( mail-client/claws-mail - mail-client/claws-mail-notification - x11-themes/claws-mail-themes - www-client/firefox - www-client/luakit - net-im/psi - net-misc/youtube-dl - net-p2p/transmission - net-p2p/transmission-remote-gtk -) -" === modified file 'stagebuilder.pl' --- stagebuilder.pl 2012-03-26 00:01:55 +0000 +++ stagebuilder.pl 2012-03-25 09:54:21 +0000 @@ -198,7 +198,6 @@ package_world('net-wireless/wpa_supplicant') ]). -gentoo_package(bindist, [], [bindist]). gentoo_package(latex, [ package_world('app-text/texlive'), package_world('dev-tex/latex-beamer'), @@ -230,8 +229,7 @@ 'zsh-completion', unicode ]). gentoo_package(base_system, [ - package_world('ccx-meta/base-system'), - package_use('dev-lang/tk threads') % needed for ruby stuff, whatever pulls it in + package_world('ccx-meta/base-system') ], [ caps, xattrs, acl, sqlite, sqlite3 ]). @@ -314,21 +312,6 @@ gentoo_package(Name, Echos, UseEnabled, []) :- gentoo_package(Name, Echos, UseEnabled). -package_list(common, [ - portage22, bindist - ]). - -package_list(desktop, [ - vim, mc, nokit, - portage_utilities, - base_utilities, base_system, base_network, - network_utilities, filesystem_utilities, - base_x11, base_media, net_clients - ]). -package_list(laptop, [ - package_list(desktop), wifi - ]). - % USE handling use_check_atom(Use) :- @@ -350,12 +333,6 @@ aggregate_package_use(PkgNames, AggUseEnabled, AggUseDisabled), ord_union(PkgUseEnabled, AggUseEnabled, UseEnabled), ord_union(PkgUseDisabled, AggUseDisabled, UseDisabled). -aggregate_package_use([package_list(PkgListName)|PkgNames], UseEnabled, UseDisabled) :- - package_list(PkgListName, Packages), - aggregate_package_use(Packages, PkgUseEnabled, PkgUseDisabled), - aggregate_package_use(PkgNames, AggUseEnabled, AggUseDisabled), - ord_union(PkgUseEnabled, AggUseEnabled, UseEnabled), - ord_union(PkgUseDisabled, AggUseDisabled, UseDisabled). disabled_use(Use, +('-', Use)). @@ -395,11 +372,6 @@ gentoo_package(Pkg, Echos, _, _), append(Echos, Tail, List), extract_package_echo(Rest, Tail). -extract_package_echo([package_list(Name)|Rest], List) :- - package_list(Name, Packages), - extract_package_echo(Packages, Echos), - append(Echos, Tail, List), - extract_package_echo(Rest, Tail). aggregate_package_echo(Packages, Assoc) :- extract_package_echo(Packages, EchoPkgList), @@ -422,16 +394,6 @@ assoc_to_list(Assoc, Pairs), maplist(package_echo_dir(Dir), Pairs, Commands). -extract_package_names([], []). -extract_package_names([Pkg|Rest], [Pkg|FlatRest]) :- - atom(Pkg), - extract_package_names(Rest, FlatRest). -extract_package_names([package_list(Name)|Rest], Joined) :- - package_list(Name, Packages), - extract_package_names(Packages, FlatPackages), - append(FlatPackages, FlatRest, Joined), - extract_package_names(Rest, FlatRest). - % % altering make.conf % @@ -439,9 +401,7 @@ dir_make_conf(Dir, Dir +/+ 'etc/make.conf'). configure_gentoo_packages(Dir, Packages) --> - { extract_package_names(Packages, PkgNames), - join(' ', PkgNames, PackagesJoined) - }, + {join(' ', Packages, PackagesJoined)}, [ comment('configure packages: ' + PackagesJoined), echo_append('USE="' + JoinedUse + '"', Make_conf), run([mkdir, '-p', Dir +/+ 'etc/portage/package.use']) @@ -560,114 +520,114 @@ target(Commands, Name, Dir) :- phrase(target(Name, Dir), Commands). -%target(i686_hardened_stage3, Dir) --> -% create_gentoo_builddir(i686_hardened, Dir), -% reset_make_conf(Dir, -% '-O2 -pipe -march=i686 -mtune=pentium4 -fomit-frame-pointer', -% '${CFLAGS}', -% 'i686-pc-linux-gnu'), -% append_site_make_conf(Dir), -% configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim]), -% [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])], -% gentoo_build_stage3(i686_hardened, Dir). -% -%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)], -% append_site_make_conf(Dir), -% configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim, nokit, geode_optimize]), -% 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)}, -% 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_stage4(amd64_testing, Dir). -% -% -%target(amd64_hardened_vshost, Dir) --> -% create_gentoo_builddir(amd64_hardened, 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, -% base_utilities, base_system, base_network, -% network_utilities, filesystem_utilities -% ]), -% gentoo_build_stage4(amd64_hardened_vshost, Dir). -% -%target(amd64_vserver_base, Dir) --> -% amd64_hardened_vserver(amd64_vserver_base, [], Dir). +target(i686_hardened_stage3, Dir) --> + create_gentoo_builddir(i686_hardened, Dir), + reset_make_conf(Dir, + '-O2 -pipe -march=i686 -mtune=pentium4 -fomit-frame-pointer', + '${CFLAGS}', + 'i686-pc-linux-gnu'), + append_site_make_conf(Dir), + configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim]), + [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])], + gentoo_build_stage3(i686_hardened, Dir). + +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)], + append_site_make_conf(Dir), + configure_gentoo_packages(Dir, [portage22, nopy3k, mc, vim, nokit, geode_optimize]), + 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)}, + 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_stage4(amd64_testing, Dir). + + +target(amd64_hardened_vshost, Dir) --> + create_gentoo_builddir(amd64_hardened, 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, + base_utilities, base_system, base_network, + network_utilities, filesystem_utilities + ]), + gentoo_build_stage4(amd64_hardened_vshost, Dir). + +target(amd64_vserver_base, Dir) --> + amd64_hardened_vserver(amd64_vserver_base, [], Dir). target(Name, Dir) --> % stable create_gentoo_builddir(StageName, Dir), @@ -758,24 +718,28 @@ {dir_make_conf(Dir, Make_conf)}, [echo_append('VIDEO_CARDS="dummy fbdev vesa intel"', Make_conf)], configure_gentoo_packages(Dir ,[ - package_list(common), package_list(laptop), - development_utilities, latex + portage22, vim, mc, nokit, + portage_utilities, + base_utilities, base_system, base_network, + network_utilities, filesystem_utilities, + base_x11, base_media, net_clients, + development_utilities, latex, wifi ]). -%amd64_hardened_vserver(Name, Packages, Dir) --> -% create_gentoo_builddir(amd64_hardened_nomulti, 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, -% base_utilities, base_system, -% vserver_init -% | Packages -% ]), -% gentoo_build_stage4(Name, Dir). +amd64_hardened_vserver(Name, Packages, Dir) --> + create_gentoo_builddir(amd64_hardened_nomulti, 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, + base_utilities, base_system, + vserver_init + | Packages + ]), + gentoo_build_stage4(Name, Dir). printnl(Text) :- print(Text),