From d45b8f991744d270273065de46127b41a7b93397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 28 Mar 2018 13:43:40 +0200 Subject: Cleanup in intel/amd profile CPU secific profiles moved to base --- profiles/amd/parent | 1 - profiles/base/amd64/amd/package.use | 1 + profiles/base/amd64/amd/parent | 1 + profiles/base/amd64/desktop/packages | 1 - profiles/base/amd64/desktop/parent | 1 - profiles/base/amd64/intel/package.use | 2 ++ profiles/base/amd64/intel/packages | 2 ++ profiles/base/amd64/intel/parent | 1 + profiles/base/amd64/virt/package.use | 1 - profiles/base/amd64/virt/parent | 1 - profiles/cynerd-desktop/package.use | 2 +- profiles/cynerd-desktop/packages | 2 ++ profiles/cynerd-desktop/parent | 2 +- profiles/cynerd-laptop/package.use | 3 +++ profiles/cynerd-laptop/packages | 1 + profiles/cynerd-laptop/parent | 2 +- profiles/cynerd-server/parent | 2 +- profiles/intel/package.use | 2 -- profiles/intel/packages | 2 -- profiles/intel/parent | 1 - profiles/work-pc/package.use | 3 +++ profiles/work-pc/packages | 2 ++ profiles/work-pc/parent | 2 +- 23 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 profiles/amd/parent create mode 100644 profiles/base/amd64/amd/package.use create mode 100644 profiles/base/amd64/amd/parent delete mode 100644 profiles/base/amd64/desktop/packages delete mode 100644 profiles/base/amd64/desktop/parent create mode 100644 profiles/base/amd64/intel/package.use create mode 100644 profiles/base/amd64/intel/packages create mode 100644 profiles/base/amd64/intel/parent delete mode 100644 profiles/base/amd64/virt/package.use delete mode 100644 profiles/base/amd64/virt/parent create mode 100644 profiles/cynerd-laptop/packages delete mode 100644 profiles/intel/package.use delete mode 100644 profiles/intel/packages delete mode 100644 profiles/intel/parent diff --git a/profiles/amd/parent b/profiles/amd/parent deleted file mode 100644 index d5b1fb1..0000000 --- a/profiles/amd/parent +++ /dev/null @@ -1 +0,0 @@ -../base/amd64/desktop diff --git a/profiles/base/amd64/amd/package.use b/profiles/base/amd64/amd/package.use new file mode 100644 index 0000000..8f41fa9 --- /dev/null +++ b/profiles/base/amd64/amd/package.use @@ -0,0 +1 @@ +sys-kernel/linux amd diff --git a/profiles/base/amd64/amd/parent b/profiles/base/amd64/amd/parent new file mode 100644 index 0000000..eb4d905 --- /dev/null +++ b/profiles/base/amd64/amd/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/base/amd64/desktop/packages b/profiles/base/amd64/desktop/packages deleted file mode 100644 index e324593..0000000 --- a/profiles/base/amd64/desktop/packages +++ /dev/null @@ -1 +0,0 @@ -sys-boot/myinitramfs diff --git a/profiles/base/amd64/desktop/parent b/profiles/base/amd64/desktop/parent deleted file mode 100644 index eb4d905..0000000 --- a/profiles/base/amd64/desktop/parent +++ /dev/null @@ -1 +0,0 @@ -../ diff --git a/profiles/base/amd64/intel/package.use b/profiles/base/amd64/intel/package.use new file mode 100644 index 0000000..50678a6 --- /dev/null +++ b/profiles/base/amd64/intel/package.use @@ -0,0 +1,2 @@ +sys-kernel/linux intel +sys-firmware/intel-microcode initramfs diff --git a/profiles/base/amd64/intel/packages b/profiles/base/amd64/intel/packages new file mode 100644 index 0000000..29f936a --- /dev/null +++ b/profiles/base/amd64/intel/packages @@ -0,0 +1,2 @@ +sys-firmware/intel-microcode +sys-apps/iucode_tool diff --git a/profiles/base/amd64/intel/parent b/profiles/base/amd64/intel/parent new file mode 100644 index 0000000..eb4d905 --- /dev/null +++ b/profiles/base/amd64/intel/parent @@ -0,0 +1 @@ +../ diff --git a/profiles/base/amd64/virt/package.use b/profiles/base/amd64/virt/package.use deleted file mode 100644 index 6a5db95..0000000 --- a/profiles/base/amd64/virt/package.use +++ /dev/null @@ -1 +0,0 @@ -sys-kernel/linux virt -initramfs diff --git a/profiles/base/amd64/virt/parent b/profiles/base/amd64/virt/parent deleted file mode 100644 index eb4d905..0000000 --- a/profiles/base/amd64/virt/parent +++ /dev/null @@ -1 +0,0 @@ -../ diff --git a/profiles/cynerd-desktop/package.use b/profiles/cynerd-desktop/package.use index 8f41fa9..16a1e8e 100644 --- a/profiles/cynerd-desktop/package.use +++ b/profiles/cynerd-desktop/package.use @@ -1 +1 @@ -sys-kernel/linux amd +sys-kernel/linux initramfs diff --git a/profiles/cynerd-desktop/packages b/profiles/cynerd-desktop/packages index 5589028..c43f1f2 100644 --- a/profiles/cynerd-desktop/packages +++ b/profiles/cynerd-desktop/packages @@ -1,2 +1,4 @@ +sys-boot/myinitramfs + # lighttpd www-servers/lighttpd diff --git a/profiles/cynerd-desktop/parent b/profiles/cynerd-desktop/parent index e613464..9f666a3 100644 --- a/profiles/cynerd-desktop/parent +++ b/profiles/cynerd-desktop/parent @@ -1,4 +1,4 @@ -../amd +../base/amd64/amd ../desktop/x ../devel ../latex diff --git a/profiles/cynerd-laptop/package.use b/profiles/cynerd-laptop/package.use index 49fb627..83b2802 100644 --- a/profiles/cynerd-laptop/package.use +++ b/profiles/cynerd-laptop/package.use @@ -1,2 +1,5 @@ +# For myinitramfs +sys-kernel/linux initramfs + # Required by chromium dev-libs/libxml2 icu diff --git a/profiles/cynerd-laptop/packages b/profiles/cynerd-laptop/packages new file mode 100644 index 0000000..e324593 --- /dev/null +++ b/profiles/cynerd-laptop/packages @@ -0,0 +1 @@ +sys-boot/myinitramfs diff --git a/profiles/cynerd-laptop/parent b/profiles/cynerd-laptop/parent index 44cb85c..5d1eef2 100644 --- a/profiles/cynerd-laptop/parent +++ b/profiles/cynerd-laptop/parent @@ -1,4 +1,4 @@ -../intel +../base/amd64/intel ../laptop ../qemu ../devel diff --git a/profiles/cynerd-server/parent b/profiles/cynerd-server/parent index c9af4f0..ffc5cf7 100644 --- a/profiles/cynerd-server/parent +++ b/profiles/cynerd-server/parent @@ -1 +1 @@ -../base/amd64/virt +../base/amd64 diff --git a/profiles/intel/package.use b/profiles/intel/package.use deleted file mode 100644 index 50678a6..0000000 --- a/profiles/intel/package.use +++ /dev/null @@ -1,2 +0,0 @@ -sys-kernel/linux intel -sys-firmware/intel-microcode initramfs diff --git a/profiles/intel/packages b/profiles/intel/packages deleted file mode 100644 index 29f936a..0000000 --- a/profiles/intel/packages +++ /dev/null @@ -1,2 +0,0 @@ -sys-firmware/intel-microcode -sys-apps/iucode_tool diff --git a/profiles/intel/parent b/profiles/intel/parent deleted file mode 100644 index d5b1fb1..0000000 --- a/profiles/intel/parent +++ /dev/null @@ -1 +0,0 @@ -../base/amd64/desktop diff --git a/profiles/work-pc/package.use b/profiles/work-pc/package.use index 58cbabb..29eabf7 100644 --- a/profiles/work-pc/package.use +++ b/profiles/work-pc/package.use @@ -1,3 +1,6 @@ +# For myinitramfs +sys-kernel/linux initramfs + # Required by chromium dev-libs/libxml2 icu diff --git a/profiles/work-pc/packages b/profiles/work-pc/packages index 2db1f1a..1f33d50 100644 --- a/profiles/work-pc/packages +++ b/profiles/work-pc/packages @@ -1,2 +1,4 @@ +sys-boot/myinitramfs + # Dockershit app-emulation/docker diff --git a/profiles/work-pc/parent b/profiles/work-pc/parent index 910277b..6fb7d08 100644 --- a/profiles/work-pc/parent +++ b/profiles/work-pc/parent @@ -1,4 +1,4 @@ -../intel +../base/amd64/intel ../desktop/x ../intel ../qemu -- cgit v1.2.3