iso/*: Add zram, move to k6.1 and cleanup

iso/funtoo-dev.yaml

@@ -3,12 +3,12 @@ packages:
   keep_luet_db: "true"
   rootfs:
   - system/entities
-  - system/luet-geaaru
+  - system/luet-geaaru-thin
   - utils/yq
   - utils/jq
 
   - app-admin/whip
-  - app-admin/macaronictl
+  - app-admin/macaronictl-thin
   - macaroni/live-setup
   - macaroni/whip-catalog
   - macaroni/skel-phoenix
@@ -24,19 +24,19 @@ packages:
 
   - virtual-entities/base
 
-  - kernel-5.4/macaroni-lts-full
-  - kernel-5.4/macaroni-lts-modules
-
   - www-client/firefox-bin
-  - kernel-5.4/macaroni-lts-initramfs
   - gnome-base/gnome
 
   - app-editors/vim
 
-  # Extra kernel modules
-  - sys-fs-5.4/zfs-kmod
-  - kernel-5.4/virtualbox-guest-additions
-  - x11-drivers-5.4/nvidia-kernel-modules
+  # kernel stuff
+  - kernel-6.1/macaroni-full
+  - kernel-6.1/macaroni-modules
+  - kernel-6.1/macaroni-initramfs
+  - kernel-6.1/zfs-kmod
+  - kernel-6.1/virtualbox-guest-additions
+  - kernel-6.1/nvidia-kernel-modules
+
   - sys-kernel/linux-firmware
   - sys-kernel/dracut
   - sys-fs/mdadm
@@ -52,6 +52,8 @@ packages:
   - sys-process/htop
   - sys-apps/ethtool
   - sys-apps/less
+  - sys-apps/which
+  - sys-apps/diffutils
   - net-wireless/wpa_supplicant
   - net-wireless/wireless-regdb
   - sys-fs/eudev
@@ -67,6 +69,8 @@ packages:
   - sys-fs/btrfs-progs
   - sys-fs/xfsprogs
   - sys-fs/zfs
+  - app-antivirus/lkrg
+  - sys-block/zram-init
 
   # Add plymouth
   - sys-boot/plymouth
@@ -98,13 +102,6 @@ packages:
   # Needed for the font cache generation
   - media-fonts/encodings
 
-  # Libraries missing on runtime deps (for issue on macaroni specs or funtoo)
-  # htop, wpa_supplicant
-  - dev-libs-3/libnl
-  # cd-info, cdda-player, etc.
-  - media-libs/libcddb
-  # probably virtual/libusb to fix
-  - dev-libs-1/libusb
   # gjs-console, gjs (libmozjs-68)
   - dev-lang-68/spidermonkey
   # gnome-system-monitor, etc
@@ -134,7 +131,6 @@ packages:
   #- x11-wm/twm
   #- x11-terms/xterm
   - sys-libs/libutempter
-  - sys-apps/which
 
   # Needed by /usr/lib64/dri/*.so
   - sys-devel/llvm-common

iso/funtoo-gnome-devel.yaml

@@ -3,33 +3,40 @@ packages:
   keep_luet_db: "true"
   rootfs:
   - system/entities
-  - system/luet-geaaru
+  - system/luet-geaaru-thin
   - utils/yq
   - utils/jq
 
+  - app-admin/whip
+  - whip-profiles/macaroni
+  - app-admin/macaronictl-thin
   - macaroni/live-setup-gnome
   - macaroni-release/funtoo
+  - macaroni/whip-catalog
+  - macaroni/skel-phoenix
 
   - virtual/sh
   - virtual/base
   - virtual/openrc
   - virtual/gnome
   - virtual/grub
-  - virtual/macaroni-kernel-lts
 
   - virtual-entities/base
 
   - www-client/firefox-bin
-  - kernel/macaroni-lts-initramfs
-  - gnome-base/gnome
 
+  - gnome-base/gnome
   - app-editors/vim
 
-  # Extra kernel modules
-  - sys-fs-5.10/zfs-kmod
-  - kernel-5.10/rtw89
-  - kernel-5.10/virtualbox-guest-additions
-  - x11-drivers-5.10/nvidia-kernel-modules
+  # kernel stuff
+  - kernel-6.1/macaroni-full
+  - kernel-6.1/macaroni-modules
+  - kernel-6.1/macaroni-initramfs
+  - kernel-6.1/zfs-kmod
+  - kernel-6.1/virtualbox-guest-additions
+  - kernel-6.1/nvidia-kernel-modules
+  - kernel-6.1/lkrg
+
   - sys-kernel/linux-firmware
   - sys-kernel/dracut
   - sys-fs/mdadm
@@ -45,6 +52,8 @@ packages:
   - sys-process/htop
   - sys-apps/ethtool
   - sys-apps/less
+  - sys-apps/which
+  - sys-apps/diffutils
   - net-wireless/wpa_supplicant
   - net-wireless/wireless-regdb
   - sys-fs/eudev
@@ -67,6 +76,8 @@ packages:
   - sys-fs/btrfs-progs
   - sys-fs/xfsprogs
   - sys-fs/zfs
+  - app-antivirus/lkrg
+  - sys-block/zram-init
 
   # Add plymouth
   - sys-boot/plymouth
@@ -98,13 +109,6 @@ packages:
   # Needed for the font cache generation
   - media-fonts/encodings
 
-  # Libraries missing on runtime deps (for issue on macaroni specs or funtoo)
-  # htop, wpa_supplicant
-  - dev-libs-3/libnl
-  # cd-info, cdda-player, etc.
-  - media-libs/libcddb
-  # probably virtual/libusb to fix
-  - dev-libs-1/libusb
   # gjs-console, gjs (libmozjs-68)
   - dev-lang-68/spidermonkey
   # gnome-system-monitor, etc

iso/funtoo-live-testing.yaml

@@ -16,29 +16,22 @@ packages:
   - virtual/openrc
   - virtual/gnome
   - virtual/grub
-  #- virtual/macaroni-kernel-lts
-  - kernel-5.15/macaroni-lts-full
-  - kernel-5.15/macaroni-lts-modules
 
   - virtual-entities/base
 
   - www-client/firefox-bin
-  - kernel-5.15/macaroni-lts-initramfs
   - gnome-base/gnome
 
   - app-editors/vim
 
-  # Extra kernel modules
-  #- sys-fs-5.10/zfs-kmod
-  #- kernel-5.10/rtw89
-  #- kernel-5.10/virtualbox-guest-additions
-  #- x11-drivers-5.10/nvidia-kernel-modules
-
-  - sys-fs-5.15/zfs-kmod
-  - kernel-5.15/rtw89
-  - kernel-5.15/virtualbox-guest-additions
-  - x11-drivers-5.15/nvidia-kernel-modules
-  - kernel-5.15/lkrg
+  # kernel stuff
+  - kernel-6.1/macaroni-full
+  - kernel-6.1/macaroni-modules
+  - kernel-6.1/macaroni-initramfs
+  - kernel-6.1/zfs-kmod
+  - kernel-6.1/virtualbox-guest-additions
+  - kernel-6.1/nvidia-kernel-modules
+  - kernel-6.1/lkrg
 
   - app-antivirus/lkrg
 

iso/funtoo-live.yaml

@@ -3,33 +3,39 @@ packages:
   keep_luet_db: "true"
   rootfs:
   - system/entities
-  - system/luet-geaaru
+  - system/luet-geaaru-thin
   - utils/yq
   - utils/jq
 
+  - app-admin/whip
+  - whip-profiles/macaroni
+  - app-admin/macaronictl-thin
   - macaroni/live-setup-gnome
   - macaroni-release/funtoo
+  - macaroni/whip-catalog
+  - macaroni/skel-phoenix
 
   - virtual/sh
   - virtual/base
   - virtual/openrc
   - virtual/gnome
   - virtual/grub
-  - virtual/macaroni-kernel-lts
 
   - virtual-entities/base
 
   - www-client/firefox-bin
-  - kernel/macaroni-lts-initramfs
   - gnome-base/gnome
 
   - app-editors/vim
 
-  # Extra kernel modules
-  - sys-fs-5.10/zfs-kmod
-  - kernel-5.10/rtw89
-  - kernel-5.10/virtualbox-guest-additions
-  - x11-drivers-5.10/nvidia-kernel-modules
+  # kernel stuff
+  - kernel-6.1/macaroni-full
+  - kernel-6.1/macaroni-modules
+  - kernel-6.1/macaroni-initramfs
+  - kernel-6.1/zfs-kmod
+  - kernel-6.1/virtualbox-guest-additions
+  - kernel-6.1/nvidia-kernel-modules
+  - kernel-6.1/lkrg
   - sys-kernel/linux-firmware
   - sys-kernel/dracut
   - sys-fs/mdadm
@@ -45,6 +51,8 @@ packages:
   - sys-process/htop
   - sys-apps/ethtool
   - sys-apps/less
+  - sys-apps/which
+  - sys-apps/diffutils
   - net-wireless/wpa_supplicant
   - net-wireless/wireless-regdb
   - sys-fs/eudev
@@ -67,6 +75,8 @@ packages:
   - sys-fs/btrfs-progs
   - sys-fs/xfsprogs
   - sys-fs/zfs
+  - app-antivirus/lkrg
+  - sys-block/zram-init
 
   # Add plymouth
   - sys-boot/plymouth

iso/funtoo-server-devel.yaml

@@ -3,38 +3,42 @@ packages:
   keep_luet_db: "true"
   rootfs:
   - system/entities
-  - system/luet-geaaru
+  - system/luet-geaaru-thin
   - utils/yq
   - utils/jq
 
   - macaroni-release/funtoo
   - macaroni/live-setup-server
+  - app-admin/whip
+  - whip-profiles/macaroni
+  - app-admin/macaronictl-thin
+  - macaroni/whip-catalog
+  - macaroni/skel-phoenix
 
   - virtual/sh
   - virtual/base
   - virtual/openrc
-  - virtual/macaroni-kernel-lts
   # Needed to add dracut 99-macaroni.conf file
   - virtual/grub
 
   - virtual-entities/base
 
-  - kernel/macaroni-lts-initramfs
-
   - app-editors/vim
+
   # needed for vim
   - media-libs/libcanberra
 
-  # Needed for env-update
-  - sys-apps/portage
   - sys-apps/diffutils
 
   # Extra kernel modules
-  - sys-fs-5.10/zfs-kmod
+  - kernel-5.10/macaroni-full
+  - kernel-5.10/macaroni-modules
+  - kernel-5.10/macaroni-initramfs
+  - kernel-5.10/zfs-kmod
   - kernel-5.10/rtw89
   - kernel-5.10/virtualbox-guest-additions
   - kernel-5.10/virtualbox-modules
-  - x11-drivers-5.10/nvidia-kernel-modules
+  - kernel-5.10/nvidia-kernel-modules
   - sys-kernel/linux-firmware
   - sys-kernel/dracut
   - sys-fs/mdadm
@@ -69,6 +73,8 @@ packages:
   - sys-fs/btrfs-progs
   - sys-fs/xfsprogs
   - sys-fs/zfs
+  - app-antivirus/lkrg
+  - sys-block/zram-init
 
   # Add plymouth
   - sys-boot/plymouth

iso/funtoo-server.yaml

@@ -3,22 +3,24 @@ packages:
   keep_luet_db: "true"
   rootfs:
   - system/entities
-  - system/luet-geaaru
+  - system/luet-geaaru-thin
   - utils/yq
   - utils/jq
 
   - macaroni-release/funtoo
   - macaroni/live-setup-server
+  - app-admin/whip
+  - whip-profiles/macaroni
+  - app-admin/macaronictl-thin
+  - macaroni/whip-catalog
+  - macaroni/skel-phoenix
 
   - virtual/sh
   - virtual/base
   - virtual/openrc
-  - virtual/macaroni-kernel-lts
   # Need for add dracut 99-macaroni.conf file
   - virtual/grub
 
-  - kernel/macaroni-lts-initramfs
-
   - app-editors/vim
   # needed for vim
   - media-libs/libcanberra
@@ -28,11 +30,11 @@ packages:
   - sys-apps/diffutils
 
   # Extra kernel modules
-  - sys-fs-5.10/zfs-kmod
+  - kernel-5.10/zfs-kmod
   - kernel-5.10/rtw89
   - kernel-5.10/virtualbox-guest-additions
   - kernel-5.10/virtualbox-modules
-  - x11-drivers-5.10/nvidia-kernel-modules
+  - kernel-5.10/nvidia-kernel-modules
   - sys-kernel/linux-firmware
   - sys-kernel/dracut
   - sys-fs/mdadm
@@ -67,6 +69,8 @@ packages:
   - sys-fs/btrfs-progs
   - sys-fs/xfsprogs
   - sys-fs/zfs
+  - app-antivirus/lkrg
+  - sys-block/zram-init
 
   # Add plymouth
   - sys-boot/plymouth