commit: cc0d41803910545b61235eae9192a2d0f82b9813 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Thu Oct 26 23:54:22 2017 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Oct 26 23:54:22 2017 +0000 URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=cc0d4180
Collapse cycles 2 and 3 build | 7 ---- core/etc/portage/make.conf.CYCLE.2 | 5 +-- core/etc/portage/make.conf.CYCLE.3 | 10 ------ core/var/lib/portage/world.CYCLE.2 | 2 ++ core/var/lib/portage/world.CYCLE.3 | 65 -------------------------------------- scripts/cycle.2.sh | 2 ++ scripts/cycle.3.sh | 9 ------ scripts/kernel-config | 2 +- 8 files changed, 6 insertions(+), 96 deletions(-) diff --git a/build b/build index 5ca3387..65d9e54 100644 --- a/build +++ b/build @@ -15,13 +15,6 @@ populate 2 runscript cycle.2.sh log stamp -log CYCLE_3 -log stamp - -populate 3 -runscript cycle.3.sh - -log stamp log Configure+Cleanup+Kernel log stamp diff --git a/core/etc/portage/make.conf.CYCLE.2 b/core/etc/portage/make.conf.CYCLE.2 index bb55faa..02b1fd4 100644 --- a/core/etc/portage/make.conf.CYCLE.2 +++ b/core/etc/portage/make.conf.CYCLE.2 @@ -5,7 +5,4 @@ MAKEOPTS="-j17" PAX_MARKINGS="XT" -LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavi an sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu" - -USE="-cups -tk -fontforge" -USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d" +PORTAGE_BINHOST="http://bluemoon.freeharbor.net/"; diff --git a/core/etc/portage/make.conf.CYCLE.3 b/core/etc/portage/make.conf.CYCLE.3 deleted file mode 100644 index b309428..0000000 --- a/core/etc/portage/make.conf.CYCLE.3 +++ /dev/null @@ -1,10 +0,0 @@ -CFLAGS="-O2 -pipe -fno-diagnostics-color" -CXXFLAGS="${CFLAGS}" -CHOST="x86_64-pc-linux-gnu" -MAKEOPTS="-j17" - -PAX_MARKINGS="XT" - -LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavi an sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu" - -PORTAGE_BINHOST="http://bluemoon.freeharbor.net/"; diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2 index c22bfed..b495d89 100644 --- a/core/var/lib/portage/world.CYCLE.2 +++ b/core/var/lib/portage/world.CYCLE.2 @@ -6,6 +6,7 @@ app-editors/nano app-editors/vim app-misc/tmux app-office/abiword +app-office/gnumeric app-portage/gentoolkit app-portage/grs app-portage/layman @@ -51,6 +52,7 @@ sys-kernel/linux-firmware sys-libs/cracklib sys-libs/db sys-libs/gdbm +sys-process/fcron sys-process/lsof x11-base/xorg-server x11-libs/gksu diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3 deleted file mode 100644 index b495d89..0000000 --- a/core/var/lib/portage/world.CYCLE.3 +++ /dev/null @@ -1,65 +0,0 @@ -app-admin/sudo -app-admin/syslog-ng -app-arch/file-roller -app-editors/gedit -app-editors/nano -app-editors/vim -app-misc/tmux -app-office/abiword -app-office/gnumeric -app-portage/gentoolkit -app-portage/grs -app-portage/layman -app-text/evince -app-text/tree -dev-lang/python -dev-lang/tcl -dev-libs/gmp -dev-util/strace -dev-vcs/git -gnome-extra/gnome-system-monitor -mail-client/claws-mail -mail-client/nail -mail-mta/postfix -media-gfx/eog -media-gfx/gimp -media-sound/alsa-utils -media-video/smplayer -net-analyzer/tcpdump -net-dns/avahi -net-dns/bind-tools -net-fs/samba -net-ftp/lftp -net-irc/hexchat -net-mail/dovecot -net-misc/ntp -net-misc/rdate -net-misc/vinagre -net-p2p/transmission -net-vpn/tor -net-wireless/wpa_supplicant -sys-apps/dbus -sys-apps/elfix -sys-apps/gradm -sys-apps/less -sys-apps/paxctl -sys-apps/pciutils -sys-boot/lilo -sys-devel/gdb -sys-fs/cryptsetup -sys-kernel/genkernel -sys-kernel/linux-firmware -sys-libs/cracklib -sys-libs/db -sys-libs/gdbm -sys-process/fcron -sys-process/lsof -x11-base/xorg-server -x11-libs/gksu -x11-misc/slim -x11-terms/xfce4-terminal -x11-terms/xterm -xfce-base/xfce4-appfinder -xfce-base/xfce4-meta -xfce-extra/thunar-archive-plugin -xfce-extra/thunar-shares-plugin diff --git a/scripts/cycle.2.sh b/scripts/cycle.2.sh index ee7fc3a..a08f5e2 100644 --- a/scripts/cycle.2.sh +++ b/scripts/cycle.2.sh @@ -7,3 +7,5 @@ emerge -b1q app-portage/grs install-worldconf emerge -bevq --keep-going --verbose-conflicts --with-bdeps=y @world clean-worldconf +emerge -bq --keep-going @preserved-rebuild +emerge --depclean diff --git a/scripts/cycle.3.sh b/scripts/cycle.3.sh deleted file mode 100644 index 41640ae..0000000 --- a/scripts/cycle.3.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -source /etc/profile -env-update -install-worldconf -emerge -buvNDq --keep-going --verbose-conflicts --with-bdeps=y @world -clean-worldconf -emerge -bq --keep-going @preserved-rebuild -emerge --depclean diff --git a/scripts/kernel-config b/scripts/kernel-config index 5b46a42..ba7d2cd 100644 --- a/scripts/kernel-config +++ b/scripts/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.13.8 Kernel Configuration +# Linux/x86 4.13.8-vanilla Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y
