summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/kogaion-kernel.eclass1
-rw-r--r--eclass/live-kernel.eclass4
-rw-r--r--sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild10
-rw-r--r--sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild10
4 files changed, 14 insertions, 11 deletions
diff --git a/eclass/kogaion-kernel.eclass b/eclass/kogaion-kernel.eclass
index d90ea59c..05ddb882 100644
--- a/eclass/kogaion-kernel.eclass
+++ b/eclass/kogaion-kernel.eclass
@@ -365,6 +365,7 @@ else
x86? ( sys-apps/v86d )
splash? ( x11-themes/kogaion-artwork-core )
lvm? ( sys-fs/lvm2 sys-block/thin-provisioning-tools )
+ btrfs? ( sys-fs/btrfs-progs )
plymouth? (
|| ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-5 )
sys-boot/plymouth
diff --git a/eclass/live-kernel.eclass b/eclass/live-kernel.eclass
index 8159365e..b33b297e 100644
--- a/eclass/live-kernel.eclass
+++ b/eclass/live-kernel.eclass
@@ -351,7 +351,7 @@ if [ -n "${K_ONLY_SOURCES}" ] || [ -n "${K_FIRMWARE_PACKAGE}" ]; then
DEPEND="sys-apps/sed"
RDEPEND="${RDEPEND}"
else
- IUSE="dmraid dracut iscsi luks lvm mdadm plymouth splash"
+ IUSE="btrfs dmraid dracut iscsi luks lvm mdadm plymouth splash"
if [ -n "${K_ROGKERNEL_ZFS}" ]; then
IUSE="${IUSE} zfs"
fi
@@ -365,6 +365,7 @@ else
x86? ( sys-apps/v86d )
splash? ( x11-themes/${PLYMOUTH_THEME}-artwork-core )
lvm? ( sys-fs/lvm2 sys-block/thin-provisioning-tools )
+ btrfs? ( sys-fs/btrfs-progs )
plymouth? (
|| ( >=sys-kernel/genkernel-next-5 >=sys-kernel/genkernel-5 )
sys-boot/plymouth
@@ -517,6 +518,7 @@ _kernel_src_compile() {
local GKARGS=()
GKARGS+=( "--no-menuconfig" "--no-save-config" "--e2fsprogs" "--udev" )
# use splash && GKARGS+=( "--splash=argent" ) #NO MORE fbsplash!!!
+ use btrfs && GKARGS+=( "--btrfs" )
use plymouth && GKARGS+=( "--plymouth" "--plymouth-theme=${PLYMOUTH_THEME}" ) #reverted to use variable (check the eclass)
use dmraid && GKARGS+=( "--dmraid" )
use iscsi && GKARGS+=( "--iscsi" )
diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
index 964b0849..a70f7720 100644
--- a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.30.ebuild
@@ -6,16 +6,16 @@ EAPI=5
inherit versionator
-K_ARGKERNEL_SELF_TARBALL_NAME="live-brrc"
+K_ROGKERNEL_SELF_TARBALL_NAME="live-brrc"
K_REQUIRED_LINUX_FIRMWARE_VER="20150320"
-K_ARGKERNEL_FORCE_SUBLEVEL="0"
-K_ARGKERNEL_PATCH_UPSTREAM_TARBALL="0"
+K_ROGKERNEL_FORCE_SUBLEVEL="0"
+K_ROGKERNEL_PATCH_UPSTREAM_TARBALL="0"
_ver="$(get_version_component_range 1-2)"
if use arm; then
K_KERNEL_IMAGE_NAME="uImage dtbs"
elif [ "${_ver}" = "3.9" ]; then
- K_ARGKERNEL_ZFS="1"
+ K_ROGKERNEL_ZFS="1"
fi
K_KERNEL_NEW_VERSIONING="1"
@@ -26,5 +26,5 @@ K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
inherit live-kernel
KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Official Kogaion Live Linux Standard kernel image"
+DESCRIPTION="Official Kogaion and Argent Live Linux Standard kernel image"
RESTRICT="mirror"
diff --git a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild
index 964b0849..a70f7720 100644
--- a/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild
+++ b/sys-kernel/linux-live-brrc/linux-live-brrc-3.14.35.ebuild
@@ -6,16 +6,16 @@ EAPI=5
inherit versionator
-K_ARGKERNEL_SELF_TARBALL_NAME="live-brrc"
+K_ROGKERNEL_SELF_TARBALL_NAME="live-brrc"
K_REQUIRED_LINUX_FIRMWARE_VER="20150320"
-K_ARGKERNEL_FORCE_SUBLEVEL="0"
-K_ARGKERNEL_PATCH_UPSTREAM_TARBALL="0"
+K_ROGKERNEL_FORCE_SUBLEVEL="0"
+K_ROGKERNEL_PATCH_UPSTREAM_TARBALL="0"
_ver="$(get_version_component_range 1-2)"
if use arm; then
K_KERNEL_IMAGE_NAME="uImage dtbs"
elif [ "${_ver}" = "3.9" ]; then
- K_ARGKERNEL_ZFS="1"
+ K_ROGKERNEL_ZFS="1"
fi
K_KERNEL_NEW_VERSIONING="1"
@@ -26,5 +26,5 @@ K_MKIMAGE_KERNEL_ADDRESS="0x80008000"
inherit live-kernel
KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Official Kogaion Live Linux Standard kernel image"
+DESCRIPTION="Official Kogaion and Argent Live Linux Standard kernel image"
RESTRICT="mirror"