Generate /etc/portage/make.conf

8 files changed, 56 insertions, 7 deletions

diff --git a/base/etc/portage/make.conf.tmpl b/base/etc/portage/make.conf.tmpl
new file mode 100644
index 0000000..10ffc18
--- /dev/null
+++ b/base/etc/portage/make.conf.tmpl
@@ -0,0 +1,20 @@
+CHOST="x86_64-pc-linux-gnu"
+COMMON_CFLAGS="-O2 -march={{ arch }} -pipe"
+CFLAGS="${COMMON_FLAGS}"
+CXXFLAGS="${COMMON_FLAGS}"
+FCFLAGS="${COMMON_FLAGS}"
+FFLAGS="${COMMON_FLAGS}"
+FEATURES="buildpkg binpkg-multi-instance parallel-install"
+MAKEOPTS="-j{{ salt.status.nproc() }} -l{{ salt.status.nproc() }}"
+ACCEPT_LICENSE="linux-firmware linux-fw-redistributable no-source-code intel-ucode freedist"
+CPU_FLAGS_X86="{{ cpu_flags_x86 }}"
+LINGUAS="en en-US"
+L10N="en en-US"
+VIDEO_CARDS="{{ video_cards }}"
+INPUT_DEVICES="libinput"
+BINPKG_COMPRESS="xz"
+PORTAGE_BZIP2_COMMAND="lbzip2"
+GENTOO_MIRRORS="http//gentoo.osuosl.org/"
+PORTAGE_BINHOST="https//mattst88.com/binpkgs/amd64/{{ arch }}"
+PKGDIR="/var/cache/binpkgs/amd64/{{ arch }}"
+USE="aac archive avahi -berkdb bluetooth branding cairo caps cdda clutter cryptsetup cscope cups dbus device-mapper dvb dvd egl exif expat faad ffmpeg flac fontconfig fuse gbm -gdbm gdu gif git gles2 gnome gnome-keyring -gnome-online-accounts gpg -gpm gstreamer gtk gtk3 harfbuzz icu idn infinality jemalloc jit jpeg libidn2 libnotify libsecret luajit lz4 lzma lzo -modemmanager mng mp3 networkmanager nfs ogg opengl opus pdf png policykit pulseaudio -qt4 resolvconf samba sasl -socialweb spell sqlite -steamruntime svg systemd theora threads tiff truetype udev udisks v4l vaapi vorbis vpx vte wayland -webkit webp -widevine X x264 xcb xkb xml xpm xv xvid zeroconf zsh-completion zstd"
diff --git a/base/portage.sls b/base/portage.sls
index 02e4580..aa78f62 100644
--- a/base/portage.sls
+++ b/base/portage.sls
@@ -1,10 +1,3 @@
-/etc/portage/make.conf:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
-    - replace: False
-
 hierarchy:
   file.directory:
     - user: root
diff --git a/braswell/init.sls b/braswell/init.sls
index fb0231a..f264a84 100644
--- a/braswell/init.sls
+++ b/braswell/init.sls
@@ -1,2 +1,3 @@
 include:
   - braswell.firmware
+  - braswell.makeconf
diff --git a/braswell/makeconf.sls b/braswell/makeconf.sls
new file mode 100644
index 0000000..e2532c2
--- /dev/null
+++ b/braswell/makeconf.sls
@@ -0,0 +1,11 @@
+/etc/portage/make.conf:
+  file.managed:
+    - source: salt://base/etc/portage/make.conf.tmpl
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+    - context:
+        arch: silvermont
+        cpu_flags_x86: mmx mmxext sse sse2 sse3 ssse3 sse4_1 sse4_2 aes
+        video_cards: intel i965
diff --git a/macbook/init.sls b/macbook/init.sls
index 5eee133..ca43913 100644
--- a/macbook/init.sls
+++ b/macbook/init.sls
@@ -1,2 +1,3 @@
 include:
   - macbook.firmware
+  - macbook.makeconf
diff --git a/macbook/makeconf.sls b/macbook/makeconf.sls
new file mode 100644
index 0000000..8818f56
--- /dev/null
+++ b/macbook/makeconf.sls
@@ -0,0 +1,11 @@
+/etc/portage/make.conf:
+  file.managed:
+    - source: salt://base/etc/portage/make.conf.tmpl
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+    - context:
+        arch: haswell
+        cpu_flags_x86: mmx mmxext sse sse2 sse3 ssse3 sse4_1 sse4_2 avx avx2 aes f16c fma3
+        video_cards: intel i965
diff --git a/skylake/init.sls b/skylake/init.sls
index e14b69c..5409f47 100644
--- a/skylake/init.sls
+++ b/skylake/init.sls
@@ -1,2 +1,3 @@
 include:
   - skylake.firmware
+  - skylake.makeconf
diff --git a/skylake/makeconf.sls b/skylake/makeconf.sls
new file mode 100644
index 0000000..afd6e78
--- /dev/null
+++ b/skylake/makeconf.sls
@@ -0,0 +1,11 @@
+/etc/portage/make.conf:
+  file.managed:
+    - source: salt://base/etc/portage/make.conf.tmpl
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+    - context:
+        arch: broadwell
+        cpu_flags_x86: mmx mmxext sse sse2 sse3 ssse3 sse4_1 sse4_2 avx avx2 aes f16c fma3
+        video_cards: intel i965 iris