diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-10-26 00:30:50 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-10-26 00:30:50 +0200 |
| commit | 20d0ddc1954ed8e70f6d0ac366d6f69e5083cbe7 (patch) | |
| tree | 5220af5eeecdad43f3b5098fa9b46196bda43917 | |
| parent | 6fa3110487606c17c856480265844b2008d29f63 (diff) | |
| download | gentoo-20d0ddc1954ed8e70f6d0ac366d6f69e5083cbe7.tar.gz gentoo-20d0ddc1954ed8e70f6d0ac366d6f69e5083cbe7.tar.bz2 gentoo-20d0ddc1954ed8e70f6d0ac366d6f69e5083cbe7.tar.xz gentoo-20d0ddc1954ed8e70f6d0ac366d6f69e5083cbe7.zip | |
Adjust configuration after sync
| -rw-r--r-- | make.conf | 7 | ||||
| -rw-r--r-- | scripts/bootstrap/builder_sync.sh | 32 |
2 files changed, 33 insertions, 6 deletions
@@ -13,9 +13,8 @@ CPU_FLAGS_X86="mmx mmxext sse sse2 sse3 ssse3 sse4_1 sse4_2 aes" # DistCC build (Twice total CPUs + 1, Local CPUs). MAKEOPTS="-j59 -l5" # Default 2-jobs per localhost and 4-jobs per other nodes (increase recommended only on 4-head systems) -DISTCC_HOSTS="ipepdvcompute4/16,lzo ipepdvcompute1/8,lzo ipepdvcompute3/8,lzo localhost/4" -#DISTCC_HOSTS="localhost ipepdvcompute4/16 ipepdvcompute1/8 ipepdvcompute3/8" -#DISTCC_HOSTS="localhost ipepdvcompute4/16" +#DISTCC_HOSTS="ipepdvcompute4/16,lzo ipepdvcompute1/8,lzo ipepdvcompute3/8,lzo localhost/4" +DISTCC_HOSTS="ipepdvcompute4/16,lzo localhost" #DISTCC_HOSTS="ipepdvcompute4/16" # DISTCC server will be blacklisted if compilation fails (which may happen intentionally during configuration stage). # Short timeout is necessary to avoid it (0 disables it alltogether). Backof should be enabled to avoid failing while in backof. @@ -28,7 +27,7 @@ DISTCC_BACKOFF_PERIOD=5 # Emerge level parallelism (but suppesses output, only logs are written) #EMERGE_DEFAULT_OPTS="--jobs 4 --keep-going y" -FEATURES="${FEATURES} distcc splitdebug -test" +FEATURES="${FEATURES} splitdebug -test" #ccache is reported to cause problems. #FEATURES="ccache buildpkg getbinpkg nostrip" #FEATURES="${FEATURES} -collision-protect" diff --git a/scripts/bootstrap/builder_sync.sh b/scripts/bootstrap/builder_sync.sh index c1db7d7..59138cc 100644 --- a/scripts/bootstrap/builder_sync.sh +++ b/scripts/bootstrap/builder_sync.sh @@ -1,14 +1,42 @@ #! /bin/bash -cd /darklin/gentoo && git pull -cd /darklin/darklin4 && git pull + +# Update DarkLin repo & styx configuration +if [ -d "/darklin/gentoo" ]; then + cd "/darklin/gentoo" && git pull +else + cd "/darlin" && git clone http://darksoft.org/git/csa/devops/darkconf/gentoo.git +fi +if [ -d "/darklin/darklin4" ]; then + cd /darklin/darklin4 && git pull +else + cd "/darklin" && git clone http://darksoft.org/git/csa/devops/darkconf/darklin4.git +fi + +# Update portage emerge --sync && eix-sync emerge -1 portage +# Update extra dist files lftp http://darksoft.org/darklin/ << EOF lcd /var/cache/ mirror -c distfiles bye EOF +# Skip binary packages +rm -f /etc/portage/sets/desktop-apps-bin + +# Adjusting for legacy packets +rm -f /etc/portage/sets/legacy +rm -f /etc/portage/package.keywords/skip.keywords +rm -f /etc/portage/package.keywords/xdeps-perl* +rm -f /etc/portage/package.keywords/xdeps-firefox* +bash /etc/portage/scripts/gen-world-sets + +# update layman +#bash /etc/portage/scripts/bootstrap/layman_reinit.sh + + +# reconfigure kernel if necessary [ -f /usr/src/linux/.config ] || yes "" | make -C /usr/src/linux oldconfig |