profiles: switch to subprofiles for cpu and gpu

29 files changed, 41 insertions, 4 deletions

diff --git a/profiles/base/amd64/intel/package.use b/profiles/base/amd64/intel/package.use
deleted file mode 100644
index 50678a6..0000000
--- a/profiles/base/amd64/intel/package.use
+++ /dev/null
@@ -1,2 +0,0 @@
-sys-kernel/linux intel
-sys-firmware/intel-microcode initramfs
diff --git a/profiles/base/amd64/eapi b/profiles/base/cpu/amd/eapi
index 7f8f011..7f8f011 100644
--- a/profiles/base/amd64/eapi
+++ b/profiles/base/cpu/amd/eapi
diff --git a/profiles/base/cpu/amd/make.defaults b/profiles/base/cpu/amd/make.defaults
new file mode 100644
index 0000000..5e81b49
--- /dev/null
+++ b/profiles/base/cpu/amd/make.defaults
@@ -0,0 +1,3 @@
+# vim:ft=gentoo-make-conf
+# This applies at least for Ryzen 1800x and 2700x
+CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3"
diff --git a/profiles/base/amd64/amd/package.use b/profiles/base/cpu/amd/package.use
index 8f41fa9..8f41fa9 100644
--- a/profiles/base/amd64/amd/package.use
+++ b/profiles/base/cpu/amd/package.use
diff --git a/profiles/base/amd64/amd/parent b/profiles/base/cpu/amd/parent
index eb4d905..eb4d905 100644
--- a/profiles/base/amd64/amd/parent
+++ b/profiles/base/cpu/amd/parent
diff --git a/profiles/base/cpu/eapi b/profiles/base/cpu/eapi
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/profiles/base/cpu/eapi
@@ -0,0 +1 @@
+7
diff --git a/profiles/base/cpu/intel/eapi b/profiles/base/cpu/intel/eapi
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/profiles/base/cpu/intel/eapi
@@ -0,0 +1 @@
+7
diff --git a/profiles/base/cpu/intel/i7/eapi b/profiles/base/cpu/intel/i7/eapi
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/profiles/base/cpu/intel/i7/eapi
@@ -0,0 +1 @@
+7
diff --git a/profiles/base/cpu/intel/i7/make.defaults b/profiles/base/cpu/intel/i7/make.defaults
new file mode 100644
index 0000000..abe68c2
--- /dev/null
+++ b/profiles/base/cpu/intel/i7/make.defaults
@@ -0,0 +1,2 @@
+# vim:ft=gentoo-make-conf
+CPU_FLAGS_X86="$CPU_FLAGS_X86 f16c pclmul"
diff --git a/profiles/base/amd64/intel/parent b/profiles/base/cpu/intel/i7/parent
index eb4d905..eb4d905 100644
--- a/profiles/base/amd64/intel/parent
+++ b/profiles/base/cpu/intel/i7/parent
diff --git a/profiles/base/cpu/intel/make.defaults b/profiles/base/cpu/intel/make.defaults
new file mode 100644
index 0000000..cf152c8
--- /dev/null
+++ b/profiles/base/cpu/intel/make.defaults
@@ -0,0 +1,2 @@
+# vim:ft=gentoo-make-conf
+CPU_FLAGS_X86="aes avx avx2 fma3 mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3"
diff --git a/profiles/base/cpu/intel/package.use b/profiles/base/cpu/intel/package.use
new file mode 100644
index 0000000..d521a9e
--- /dev/null
+++ b/profiles/base/cpu/intel/package.use
@@ -0,0 +1,6 @@
+# Linux intel configuration
+sys-kernel/linux intel
+
+# Intel microcode update
+sys-firmware/intel-microcode initramfs
+sys-kernel/linux ucode
diff --git a/profiles/base/amd64/intel/packages b/profiles/base/cpu/intel/packages
index 29f936a..29f936a 100644
--- a/profiles/base/amd64/intel/packages
+++ b/profiles/base/cpu/intel/packages
diff --git a/profiles/base/cpu/intel/parent b/profiles/base/cpu/intel/parent
new file mode 100644
index 0000000..eb4d905
--- /dev/null
+++ b/profiles/base/cpu/intel/parent
@@ -0,0 +1 @@
+../
diff --git a/profiles/base/amd64/make.defaults b/profiles/base/cpu/make.defaults
index 19da33d..19da33d 100644
--- a/profiles/base/amd64/make.defaults
+++ b/profiles/base/cpu/make.defaults
diff --git a/profiles/base/amd64/package.use b/profiles/base/cpu/package.use
index a8f7308..48abed1 100644
--- a/profiles/base/amd64/package.use
+++ b/profiles/base/cpu/package.use
@@ -1,4 +1,5 @@
-# Busybox (static for initramfs)
+# myinitramfs
+sys-kernel/linux initramfs
 sys-apps/busybox static
 
 # We use xz compressed modules so we have to have support for it
diff --git a/profiles/base/amd64/packages b/profiles/base/cpu/packages
index 16d89de..718118b 100644
--- a/profiles/base/amd64/packages
+++ b/profiles/base/cpu/packages
@@ -1,5 +1,8 @@
 app-portage/cpuid2cpuflags
 
+# Always use initramfs
+sys-boot/myinitramfs
+
 # Drives
 sys-apps/hdparm
 sys-apps/smartmontools
diff --git a/profiles/base/cpu/parent b/profiles/base/cpu/parent
new file mode 100644
index 0000000..eb4d905
--- /dev/null
+++ b/profiles/base/cpu/parent
@@ -0,0 +1 @@
+../
diff --git a/profiles/base/gpu/amd/eapi b/profiles/base/gpu/amd/eapi
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/profiles/base/gpu/amd/eapi
@@ -0,0 +1 @@
+7
diff --git a/profiles/base/gpu/amd/make.defaults b/profiles/base/gpu/amd/make.defaults
new file mode 100644
index 0000000..d016091
--- /dev/null
+++ b/profiles/base/gpu/amd/make.defaults
@@ -0,0 +1,5 @@
+# vim:ft=gentoo-make-conf
+USE="$USE vaap vdpaui"
+
+VIDEO_CARDS="-* amdgpu radeonsi"
+USE_EXPAND="VIDEO_CARDS"
diff --git a/profiles/base/gpu/amd/parent b/profiles/base/gpu/amd/parent
new file mode 100644
index 0000000..eb4d905
--- /dev/null
+++ b/profiles/base/gpu/amd/parent
@@ -0,0 +1 @@
+../
diff --git a/profiles/base/gpu/eapi b/profiles/base/gpu/eapi
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/profiles/base/gpu/eapi
@@ -0,0 +1 @@
+7
diff --git a/profiles/base/gpu/intel/eapi b/profiles/base/gpu/intel/eapi
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/profiles/base/gpu/intel/eapi
@@ -0,0 +1 @@
+7
diff --git a/profiles/base/gpu/intel/make.defaults b/profiles/base/gpu/intel/make.defaults
new file mode 100644
index 0000000..40d700f
--- /dev/null
+++ b/profiles/base/gpu/intel/make.defaults
@@ -0,0 +1,3 @@
+# vim:ft=gentoo-make-conf
+VIDEO_CARDS="-* intel i965"
+USE_EXPAND="VIDEO_CARDS"
diff --git a/profiles/base/gpu/intel/package.use b/profiles/base/gpu/intel/package.use
new file mode 100644
index 0000000..c251f09
--- /dev/null
+++ b/profiles/base/gpu/intel/package.use
@@ -0,0 +1,2 @@
+# Disable opencl and d3d9 as those are not supported on intel gpu
+media-libs/mesa -opencl -d3d9
diff --git a/profiles/base/gpu/intel/parent b/profiles/base/gpu/intel/parent
new file mode 100644
index 0000000..eb4d905
--- /dev/null
+++ b/profiles/base/gpu/intel/parent
@@ -0,0 +1 @@
+../
diff --git a/profiles/base/gpu/make.defaults b/profiles/base/gpu/make.defaults
new file mode 100644
index 0000000..ccb5529
--- /dev/null
+++ b/profiles/base/gpu/make.defaults
@@ -0,0 +1,2 @@
+# vim:ft=gentoo-make-conf
+USE="$USE vulkan"
diff --git a/profiles/base/gpu/parent b/profiles/base/gpu/parent
new file mode 100644
index 0000000..eb4d905
--- /dev/null
+++ b/profiles/base/gpu/parent
@@ -0,0 +1 @@
+../
diff --git a/profiles/base/amd64/parent b/profiles/base/parent
index ce4fb73..2547f2e 100644
--- a/profiles/base/amd64/parent
+++ b/profiles/base/parent
@@ -1,2 +1 @@
 gentoo:default/linux/amd64/17.1
-../