Page MenuHomeDevCentral
Files F3751181

D3486.diff
No OneTemporary
Actions

D3486.diff
View Options

diff --git a/roles/devserver/poudriere/files/poudriere.conf b/roles/devserver/poudriere/files/poudriere.conf
--- a/roles/devserver/poudriere/files/poudriere.conf
+++ b/roles/devserver/poudriere/files/poudriere.conf
@@ -33,3 +33,9 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
USE_TMPFS={{ poudriere.tmpfs }}
+
+# -------------------------------------------------------------
+# Optimize builds speed
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+CCACHE_DIR=/var/cache/ccache
diff --git a/roles/devserver/poudriere/files/poudriere.conf b/roles/devserver/userland-software/files/ccache.conf
copy from roles/devserver/poudriere/files/poudriere.conf
copy to roles/devserver/userland-software/files/ccache.conf
--- a/roles/devserver/poudriere/files/poudriere.conf
+++ b/roles/devserver/userland-software/files/ccache.conf
@@ -1,9 +1,9 @@
# -------------------------------------------------------------
-# Poudriere configuration
+# Configuration for ccache - Fast C/C++ compiler cache
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/devserver/poudriere/files/poudriere.conf
+# Source file: roles/devserver/userland-software/files/ccache.conf
# -------------------------------------------------------------
#
# <auto-generated>
@@ -13,23 +13,13 @@
# and will be lost if the state is redeployed.
# </auto-generated>
-ZPOOL={{ poudriere.zfs_pool }}
-
-FREEBSD_HOST=https://download.FreeBSD.org
-
-RESOLV_CONF=/etc/resolv.conf
-
-BASEFS=/usr/local/poudriere
-DISTFILES_CACHE=/usr/ports/distfiles
-
-USE_PORTLINT=yes
+max_size = 5.0G
# -------------------------------------------------------------
-# RAM usage - tmpfs
+# Compiling in different directories
#
-# "yes" = "wrkdir" + "data"
-# wrkdir - Use tmpfs(5) for port building WRKDIRPREFIX
-# data - Use tmpfs(5) for poudriere cache/temp build data
+# This is especially important as Poudriere uses different
+# directories per CPU core assigned to build a package.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-USE_TMPFS={{ poudriere.tmpfs }}
+hash_dir = false
diff --git a/roles/devserver/userland-software/misc.sls b/roles/devserver/userland-software/misc.sls
--- a/roles/devserver/userland-software/misc.sls
+++ b/roles/devserver/userland-software/misc.sls
@@ -82,6 +82,10 @@
/var/cache/ccache:
file.directory
+/var/cache/ccache/ccache.conf:
+ file.managed:
+ - source: salt://roles/devserver/userland-software/files/ccache.conf
+
/etc/make.conf:
file.managed:
- source: salt://roles/devserver/userland-software/files/make.conf

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 06:20 (13 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2250376
Default Alt Text
D3486.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator