diff options
49 files changed, 54 insertions, 65 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 -../ diff --git a/profiles/desktop/make.defaults b/profiles/desktop/make.defaults index 310f9ce..6ada52a 100644 --- a/profiles/desktop/make.defaults +++ b/profiles/desktop/make.defaults @@ -1,11 +1,9 @@ # vim:ft=gentoo-make-conf -USE="$USE pulseaudio gstreamer ffmpeg vdpau" +USE="$USE pulseaudio gstreamer ffmpeg" USE="$USE apng taglib" -USE="$USE vaapi" USE="$USE cups" USE="$USE ibus" USE="$USE elogind -consolekit -systemd" -USE="$USE vulkan" L10N="en cs" LINGUAS="en cs" diff --git a/profiles/host-albert/make.defaults b/profiles/host-albert/make.defaults index 7157a9b..cc97a88 100644 --- a/profiles/host-albert/make.defaults +++ b/profiles/host-albert/make.defaults @@ -1,7 +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" MAKEOPTS="-j8 -l4" - -VIDEO_CARDS="-* intel i965" - -USE_EXPAND="VIDEO_CARDS" diff --git a/profiles/host-albert/package.use b/profiles/host-albert/package.use index 21843f3..e69de29 100644 --- a/profiles/host-albert/package.use +++ b/profiles/host-albert/package.use @@ -1,8 +0,0 @@ -# For myinitramfs -sys-kernel/linux initramfs ucode - -# Required by chromium -dev-libs/libxml2 icu - -# Disable opencl and d3d9 as those are not supported on intel gpu -media-libs/mesa -opencl -d3d9 diff --git a/profiles/host-albert/packages b/profiles/host-albert/packages index e324593..e69de29 100644 --- a/profiles/host-albert/packages +++ b/profiles/host-albert/packages @@ -1 +0,0 @@ -sys-boot/myinitramfs diff --git a/profiles/host-albert/parent b/profiles/host-albert/parent index a67f4ce..b98f1a3 100644 --- a/profiles/host-albert/parent +++ b/profiles/host-albert/parent @@ -1,4 +1,5 @@ -../base/amd64/intel +../base/cpu/intel +../base/gpu/intel ../laptop ../desktop/wayland ../devel diff --git a/profiles/host-dean/make.defaults b/profiles/host-dean/make.defaults index f0a0f73..c008c76 100644 --- a/profiles/host-dean/make.defaults +++ b/profiles/host-dean/make.defaults @@ -1,7 +1,2 @@ # vim:ft=gentoo-make-conf -CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" -MAKEOPTS="-j7" - -VIDEO_CARDS="-* intel i965" - -USE_EXPAND="VIDEO_CARDS" +MAKEOPTS="-j16 -l7" diff --git a/profiles/host-dean/package.use b/profiles/host-dean/package.use index 8a5ca18..11cdab9 100644 --- a/profiles/host-dean/package.use +++ b/profiles/host-dean/package.use @@ -1,8 +1 @@ -# For myinitramfs -sys-kernel/linux initramfs ucode - -# Required by chromium -dev-libs/libxml2 icu - app-emulation/docker btrfs -media-libs/mesa -opencl diff --git a/profiles/host-dean/packages b/profiles/host-dean/packages index c221ab0..2c54931 100644 --- a/profiles/host-dean/packages +++ b/profiles/host-dean/packages @@ -1,5 +1,3 @@ -sys-boot/myinitramfs - # Dockershit app-emulation/docker # Othershit diff --git a/profiles/host-dean/parent b/profiles/host-dean/parent index 885a804..6a98ac0 100644 --- a/profiles/host-dean/parent +++ b/profiles/host-dean/parent @@ -1,4 +1,5 @@ -../base/amd64/intel +../base/cpu/intel/i7 +../base/gpu/intel ../desktop/x ../desktop/wayland ../devel diff --git a/profiles/host-errol/make.defaults b/profiles/host-errol/make.defaults index d2975a5..418279d 100644 --- a/profiles/host-errol/make.defaults +++ b/profiles/host-errol/make.defaults @@ -1,7 +1,2 @@ # vim:ft=gentoo-make-conf -CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" MAKEOPTS="-j14" - -VIDEO_CARDS="-* amdgpu radeonsi" - -USE_EXPAND="VIDEO_CARDS" diff --git a/profiles/host-errol/package.use b/profiles/host-errol/package.use index 6a31f5f..2ec4150 100644 --- a/profiles/host-errol/package.use +++ b/profiles/host-errol/package.use @@ -2,7 +2,6 @@ acct-user/cynerd server # Kernel and initramfs sys-boot/myinitramfs dmi -sys-kernel/linux initramfs ucode # For laminar dev-cpp/websocketpp boost diff --git a/profiles/host-errol/parent b/profiles/host-errol/parent index 591547b..7cce196 100644 --- a/profiles/host-errol/parent +++ b/profiles/host-errol/parent @@ -1,3 +1,4 @@ -../base/amd64/amd +../base/cpu/amd +../base/gpu/amd ../compile ../compile/openwrt diff --git a/profiles/host-lipwig/parent b/profiles/host-lipwig/parent index c233a6c..fb54238 100644 --- a/profiles/host-lipwig/parent +++ b/profiles/host-lipwig/parent @@ -1,3 +1,2 @@ -gentoo:default/linux/amd64/17.0 ../base ../compile/openwrt diff --git a/profiles/host-ridcully/make.defaults b/profiles/host-ridcully/make.defaults index d38d886..fe73680 100644 --- a/profiles/host-ridcully/make.defaults +++ b/profiles/host-ridcully/make.defaults @@ -1,8 +1,5 @@ # vim:ft=gentoo-make-conf -CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" MAKEOPTS="-j12" INPUT_DEVICES="roccat_suora" -VIDEO_CARDS="-* amdgpu radeonsi" - -USE_EXPAND="INPUT_DEVICES VIDEO_CARDS" +USE_EXPAND="INPUT_DEVICES" diff --git a/profiles/host-ridcully/package.use b/profiles/host-ridcully/package.use index 3ffbcd1..8505c3e 100644 --- a/profiles/host-ridcully/package.use +++ b/profiles/host-ridcully/package.use @@ -1,4 +1,3 @@ acct-user/cynerd roccat -sys-kernel/linux initramfs ucode x11-themes/background-lnxpcs 1440p diff --git a/profiles/host-ridcully/packages b/profiles/host-ridcully/packages index e8f550f..f914d0b 100644 --- a/profiles/host-ridcully/packages +++ b/profiles/host-ridcully/packages @@ -1,5 +1,3 @@ -sys-boot/myinitramfs - # lighttpd www-servers/lighttpd diff --git a/profiles/host-ridcully/parent b/profiles/host-ridcully/parent index 83320e2..cfd55e6 100644 --- a/profiles/host-ridcully/parent +++ b/profiles/host-ridcully/parent @@ -1,4 +1,5 @@ -../base/amd64/amd +../base/cpu/amd +../base/gpu/amd ../desktop/x ../desktop/wayland ../devel diff --git a/profiles/host-susan/make.defaults b/profiles/host-susan/make.defaults index 38a2820..f3a5f7a 100644 --- a/profiles/host-susan/make.defaults +++ b/profiles/host-susan/make.defaults @@ -1,7 +1,2 @@ # vim:ft=gentoo-make-conf -CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" MAKEOPTS="-j3" - -VIDEO_CARDS="-* intel i965" - -USE_EXPAND="VIDEO_CARDS" diff --git a/profiles/host-susan/package.use b/profiles/host-susan/package.use index f669197..f07ff94 100644 --- a/profiles/host-susan/package.use +++ b/profiles/host-susan/package.use @@ -1,6 +1 @@ -sys-kernel/linux initramfs ucode - x11-themes/background-lnxpcs 1600p - -# Disable opencl and d3d9 as those are not supported on intel gpu -media-libs/mesa -opencl -d3d9 diff --git a/profiles/host-susan/parent b/profiles/host-susan/parent index b1f0abb..c7ca3cf 100644 --- a/profiles/host-susan/parent +++ b/profiles/host-susan/parent @@ -1,4 +1,5 @@ -../base/amd64/intel +../base/cpu/intel/i7 +../base/gpu/intel ../laptop/touch ../desktop/wayland ../devel |