Cleanup in intel/amd profile

CPU secific profiles moved to base

18 files changed, 16 insertions, 8 deletions

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/desktop/parent b/profiles/base/amd64/amd/parent
index eb4d905..eb4d905 100644
--- a/profiles/base/amd64/desktop/parent
+++ b/profiles/base/amd64/amd/parent
diff --git a/profiles/intel/package.use b/profiles/base/amd64/intel/package.use
index 50678a6..50678a6 100644
--- a/profiles/intel/package.use
+++ b/profiles/base/amd64/intel/package.use
diff --git a/profiles/intel/packages b/profiles/base/amd64/intel/packages
index 29f936a..29f936a 100644
--- a/profiles/intel/packages
+++ b/profiles/base/amd64/intel/packages
diff --git a/profiles/base/amd64/virt/parent b/profiles/base/amd64/intel/parent
index eb4d905..eb4d905 100644
--- a/profiles/base/amd64/virt/parent
+++ b/profiles/base/amd64/intel/parent
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/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/base/amd64/desktop/packages b/profiles/cynerd-laptop/packages
index e324593..e324593 100644
--- a/profiles/base/amd64/desktop/packages
+++ b/profiles/cynerd-laptop/packages
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/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