From d8d9be0691a32642c5c9815913c0ffdaa5d92edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 9 Apr 2020 09:39:01 +0200 Subject: profiles: switch to subprofiles for cpu and gpu --- profiles/base/amd64/amd/package.use | 1 - profiles/base/amd64/amd/parent | 1 - profiles/base/amd64/eapi | 1 - profiles/base/amd64/intel/package.use | 2 -- profiles/base/amd64/intel/packages | 2 -- profiles/base/amd64/intel/parent | 1 - profiles/base/amd64/make.defaults | 2 -- profiles/base/amd64/package.use | 5 ----- profiles/base/amd64/packages | 23 ----------------------- profiles/base/amd64/parent | 2 -- profiles/base/cpu/amd/eapi | 1 + profiles/base/cpu/amd/make.defaults | 3 +++ profiles/base/cpu/amd/package.use | 1 + profiles/base/cpu/amd/parent | 1 + profiles/base/cpu/eapi | 1 + profiles/base/cpu/intel/eapi | 1 + profiles/base/cpu/intel/i7/eapi | 1 + profiles/base/cpu/intel/i7/make.defaults | 2 ++ profiles/base/cpu/intel/i7/parent | 1 + profiles/base/cpu/intel/make.defaults | 2 ++ profiles/base/cpu/intel/package.use | 6 ++++++ profiles/base/cpu/intel/packages | 2 ++ profiles/base/cpu/intel/parent | 1 + profiles/base/cpu/make.defaults | 2 ++ profiles/base/cpu/package.use | 6 ++++++ profiles/base/cpu/packages | 26 ++++++++++++++++++++++++++ profiles/base/cpu/parent | 1 + profiles/base/gpu/amd/eapi | 1 + profiles/base/gpu/amd/make.defaults | 5 +++++ profiles/base/gpu/amd/parent | 1 + profiles/base/gpu/eapi | 1 + profiles/base/gpu/intel/eapi | 1 + profiles/base/gpu/intel/make.defaults | 3 +++ profiles/base/gpu/intel/package.use | 2 ++ profiles/base/gpu/intel/parent | 1 + profiles/base/gpu/make.defaults | 2 ++ profiles/base/gpu/parent | 1 + profiles/base/parent | 1 + 38 files changed, 77 insertions(+), 40 deletions(-) delete mode 100644 profiles/base/amd64/amd/package.use delete mode 100644 profiles/base/amd64/amd/parent delete mode 100644 profiles/base/amd64/eapi delete mode 100644 profiles/base/amd64/intel/package.use delete mode 100644 profiles/base/amd64/intel/packages delete mode 100644 profiles/base/amd64/intel/parent delete mode 100644 profiles/base/amd64/make.defaults delete mode 100644 profiles/base/amd64/package.use delete mode 100644 profiles/base/amd64/packages delete mode 100644 profiles/base/amd64/parent create mode 100644 profiles/base/cpu/amd/eapi create mode 100644 profiles/base/cpu/amd/make.defaults create mode 100644 profiles/base/cpu/amd/package.use create mode 100644 profiles/base/cpu/amd/parent create mode 100644 profiles/base/cpu/eapi create mode 100644 profiles/base/cpu/intel/eapi create mode 100644 profiles/base/cpu/intel/i7/eapi create mode 100644 profiles/base/cpu/intel/i7/make.defaults create mode 100644 profiles/base/cpu/intel/i7/parent create mode 100644 profiles/base/cpu/intel/make.defaults create mode 100644 profiles/base/cpu/intel/package.use create mode 100644 profiles/base/cpu/intel/packages create mode 100644 profiles/base/cpu/intel/parent create mode 100644 profiles/base/cpu/make.defaults create mode 100644 profiles/base/cpu/package.use create mode 100644 profiles/base/cpu/packages create mode 100644 profiles/base/cpu/parent create mode 100644 profiles/base/gpu/amd/eapi create mode 100644 profiles/base/gpu/amd/make.defaults create mode 100644 profiles/base/gpu/amd/parent create mode 100644 profiles/base/gpu/eapi create mode 100644 profiles/base/gpu/intel/eapi create mode 100644 profiles/base/gpu/intel/make.defaults create mode 100644 profiles/base/gpu/intel/package.use create mode 100644 profiles/base/gpu/intel/parent create mode 100644 profiles/base/gpu/make.defaults create mode 100644 profiles/base/gpu/parent create mode 100644 profiles/base/parent (limited to 'profiles/base') diff --git a/profiles/base/amd64/amd/package.use b/profiles/base/amd64/amd/package.use deleted file mode 100644 index 8f41fa9..0000000 --- a/profiles/base/amd64/amd/package.use +++ /dev/null @@ -1 +0,0 @@ -sys-kernel/linux amd diff --git a/profiles/base/amd64/amd/parent b/profiles/base/amd64/amd/parent deleted file mode 100644 index eb4d905..0000000 --- a/profiles/base/amd64/amd/parent +++ /dev/null @@ -1 +0,0 @@ -../ diff --git a/profiles/base/amd64/eapi b/profiles/base/amd64/eapi deleted file mode 100644 index 7f8f011..0000000 --- a/profiles/base/amd64/eapi +++ /dev/null @@ -1 +0,0 @@ -7 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/intel/packages b/profiles/base/amd64/intel/packages deleted file mode 100644 index 29f936a..0000000 --- a/profiles/base/amd64/intel/packages +++ /dev/null @@ -1,2 +0,0 @@ -sys-firmware/intel-microcode -sys-apps/iucode_tool diff --git a/profiles/base/amd64/intel/parent b/profiles/base/amd64/intel/parent deleted file mode 100644 index eb4d905..0000000 --- a/profiles/base/amd64/intel/parent +++ /dev/null @@ -1 +0,0 @@ -../ diff --git a/profiles/base/amd64/make.defaults b/profiles/base/amd64/make.defaults deleted file mode 100644 index 19da33d..0000000 --- a/profiles/base/amd64/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -# vim:ft=gentoo-make-conf -CHOST="x86_64-pc-linux-gnu" diff --git a/profiles/base/amd64/package.use b/profiles/base/amd64/package.use deleted file mode 100644 index a8f7308..0000000 --- a/profiles/base/amd64/package.use +++ /dev/null @@ -1,5 +0,0 @@ -# Busybox (static for initramfs) -sys-apps/busybox static - -# We use xz compressed modules so we have to have support for it -sys-apps/kmod lzma diff --git a/profiles/base/amd64/packages b/profiles/base/amd64/packages deleted file mode 100644 index 16d89de..0000000 --- a/profiles/base/amd64/packages +++ /dev/null @@ -1,23 +0,0 @@ -app-portage/cpuid2cpuflags - -# Drives -sys-apps/hdparm -sys-apps/smartmontools -sys-fs/cryptsetup - -# FS -sys-block/parted -sys-fs/btrfs-progs -sys-fs/dosfstools -sys-fs/exfat-utils -sys-fs/fuse-exfat -sys-fs/f2fs-tools - -# Linux -sys-boot/efibootmgr -sys-boot/syslinux -sys-kernel/linux -sys-kernel/linux-firmware - -# Periphery -sys-apps/usbutils diff --git a/profiles/base/amd64/parent b/profiles/base/amd64/parent deleted file mode 100644 index ce4fb73..0000000 --- a/profiles/base/amd64/parent +++ /dev/null @@ -1,2 +0,0 @@ -gentoo:default/linux/amd64/17.1 -../ diff --git a/profiles/base/cpu/amd/eapi b/profiles/base/cpu/amd/eapi new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/profiles/base/cpu/amd/eapi @@ -0,0 +1 @@ +7 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/cpu/amd/package.use b/profiles/base/cpu/amd/package.use new file mode 100644 index 0000000..8f41fa9 --- /dev/null +++ b/profiles/base/cpu/amd/package.use @@ -0,0 +1 @@ +sys-kernel/linux amd diff --git a/profiles/base/cpu/amd/parent b/profiles/base/cpu/amd/parent new file mode 100644 index 0000000..eb4d905 --- /dev/null +++ b/profiles/base/cpu/amd/parent @@ -0,0 +1 @@ +../ 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/cpu/intel/i7/parent b/profiles/base/cpu/intel/i7/parent new file mode 100644 index 0000000..eb4d905 --- /dev/null +++ b/profiles/base/cpu/intel/i7/parent @@ -0,0 +1 @@ +../ 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/cpu/intel/packages b/profiles/base/cpu/intel/packages new file mode 100644 index 0000000..29f936a --- /dev/null +++ b/profiles/base/cpu/intel/packages @@ -0,0 +1,2 @@ +sys-firmware/intel-microcode +sys-apps/iucode_tool 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/cpu/make.defaults b/profiles/base/cpu/make.defaults new file mode 100644 index 0000000..19da33d --- /dev/null +++ b/profiles/base/cpu/make.defaults @@ -0,0 +1,2 @@ +# vim:ft=gentoo-make-conf +CHOST="x86_64-pc-linux-gnu" diff --git a/profiles/base/cpu/package.use b/profiles/base/cpu/package.use new file mode 100644 index 0000000..48abed1 --- /dev/null +++ b/profiles/base/cpu/package.use @@ -0,0 +1,6 @@ +# myinitramfs +sys-kernel/linux initramfs +sys-apps/busybox static + +# We use xz compressed modules so we have to have support for it +sys-apps/kmod lzma diff --git a/profiles/base/cpu/packages b/profiles/base/cpu/packages new file mode 100644 index 0000000..718118b --- /dev/null +++ b/profiles/base/cpu/packages @@ -0,0 +1,26 @@ +app-portage/cpuid2cpuflags + +# Always use initramfs +sys-boot/myinitramfs + +# Drives +sys-apps/hdparm +sys-apps/smartmontools +sys-fs/cryptsetup + +# FS +sys-block/parted +sys-fs/btrfs-progs +sys-fs/dosfstools +sys-fs/exfat-utils +sys-fs/fuse-exfat +sys-fs/f2fs-tools + +# Linux +sys-boot/efibootmgr +sys-boot/syslinux +sys-kernel/linux +sys-kernel/linux-firmware + +# Periphery +sys-apps/usbutils 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/parent b/profiles/base/parent new file mode 100644 index 0000000..2547f2e --- /dev/null +++ b/profiles/base/parent @@ -0,0 +1 @@ +gentoo:default/linux/amd64/17.1 -- cgit v1.2.3