summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlackNoxis <steven.darklight@gmail.com>2014-11-10 15:38:24 +0200
committerBlackNoxis <steven.darklight@gmail.com>2014-11-10 15:38:24 +0200
commitfada9b0fa0332425393e1c0130f71c8c13b9a477 (patch)
tree51922418d2a31e7db3233e878ed9041650ed24c3
parent24da5ef26fe7f276c17d870b658ff3c8c5772667 (diff)
Upgraded the eclasses to see the PLYmouth themes, and also in the new kernels
-rw-r--r--eclass/kogaion-kernel.eclass4
-rw-r--r--eclass/rogentos-artwork.eclass5
-rw-r--r--eclass/rogentos-kernel.eclass4
3 files changed, 11 insertions, 2 deletions
diff --git a/eclass/kogaion-kernel.eclass b/eclass/kogaion-kernel.eclass
index cd296f0c..9d9787ea 100644
--- a/eclass/kogaion-kernel.eclass
+++ b/eclass/kogaion-kernel.eclass
@@ -279,6 +279,8 @@ _is_kernel_lts() {
[ "${_ver}" = "3.2" ] && return 0
[ "${_ver}" = "3.4" ] && return 0
[ "${_ver}" = "3.10" ] && return 0
+ [ "${_ver}" = "3.12" ] && return 0
+ [ "${_ver}" = "3.14" ] && return 0
return 1
}
@@ -871,7 +873,7 @@ kogaion-kernel_pkg_postinst() {
fi
# Update kernel initramfs to match user customizations
- update_kogaion_kernel_initramfs_splash
+ use splash && update_kogaion_kernel_initramfs_splash
# Add kernel to grub.conf
if use amd64 || use x86; then
diff --git a/eclass/rogentos-artwork.eclass b/eclass/rogentos-artwork.eclass
index 3f51fef9..6a74a673 100644
--- a/eclass/rogentos-artwork.eclass
+++ b/eclass/rogentos-artwork.eclass
@@ -18,6 +18,11 @@ KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*}"
# Default splash theme name to use
GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-rogentos}"
+# @ECLASS-VARIABLE: PLYMOUTH_THEME
+# @DESCRIPTION:
+# Default plymouth theme name to use
+PLYMOUTH_THEME="${PLYMOUTH_THEME:-rogentos}"
+
# @FUNCTION: update_kernel_initramfs_splash
# @USAGE: update_kernel_initramfs_splash [splash_theme] [splash_file]
# @RETURN: 1, if something went wrong
diff --git a/eclass/rogentos-kernel.eclass b/eclass/rogentos-kernel.eclass
index 0af155e7..78f2f90f 100644
--- a/eclass/rogentos-kernel.eclass
+++ b/eclass/rogentos-kernel.eclass
@@ -279,6 +279,8 @@ _is_kernel_lts() {
[ "${_ver}" = "3.2" ] && return 0
[ "${_ver}" = "3.4" ] && return 0
[ "${_ver}" = "3.10" ] && return 0
+ [ "${_ver}" = "3.12" ] && return 0
+ [ "${_ver}" = "3.14" ] && return 0
return 1
}
@@ -871,7 +873,7 @@ rogentos-kernel_pkg_postinst() {
fi
# Update kernel initramfs to match user customizations
- update_rogentos_kernel_initramfs_splash
+ use splash && update_rogentos_kernel_initramfs_splash
# Add kernel to grub.conf
if use amd64 || use x86; then